target/linux/ixp4xx/patches-2.6.34/603-arm-kluin-array-indexing.patch

   1 --- a/arch/arm/kernel/setup.c
   2 +++ b/arch/arm/kernel/setup.c
   3 @@ -323,12 +323,13 @@ static void __init setup_processor(void)
   4  void cpu_init(void)
   5  {
   6         unsigned int cpu = smp_processor_id();
   7 -       struct stack *stk = &stacks[cpu];
   8 +       struct stack *stk;
   9
  10         if (cpu >= NR_CPUS) {
  11                 printk(KERN_CRIT "CPU%u: bad primary CPU number\n", cpu);
  12                 BUG();
  13         }
  14 +       stk = &stacks[cpu];
  15
  16         /*
  17          * Define the placement constraint for the inline asm directive below.
  18 @@ -387,13 +388,14 @@ static struct machine_desc * __init setu
  19
  20  static int __init arm_add_memory(unsigned long start, unsigned long size)
  21  {
  22 -       struct membank *bank = &meminfo.bank[meminfo.nr_banks];
  23 +       struct membank *bank;
  24
  25         if (meminfo.nr_banks >= NR_BANKS) {
  26                 printk(KERN_CRIT "NR_BANKS too low, "
  27                         "ignoring memory at %#lx\n", start);
  28                 return -EINVAL;
  29         }
  30 +       bank = &meminfo.bank[meminfo.nr_banks];
  31
  32         /*
  33          * Ensure that start/size are aligned to a page boundary.