diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-07-24 00:18:58 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-07-24 00:18:58 +0000 |
commit | 54ad2c05af54e69ec9b21aa21f8a0305b94c85fc (patch) | |
tree | 5a16a0ac4ff7df9daad4d9c096393c306cb613c6 /target/linux/ixp4xx/patches-2.6.34/603-arm-kluin-array-indexing.patch | |
parent | 8c1d9afc409fa26245256b91eb045a2f50f54c92 (diff) | |
download | upstream-54ad2c05af54e69ec9b21aa21f8a0305b94c85fc.tar.gz upstream-54ad2c05af54e69ec9b21aa21f8a0305b94c85fc.tar.bz2 upstream-54ad2c05af54e69ec9b21aa21f8a0305b94c85fc.zip |
ixp4xx: add kernel 2.6.34 preliminary support
SVN-Revision: 22373
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.34/603-arm-kluin-array-indexing.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.34/603-arm-kluin-array-indexing.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.34/603-arm-kluin-array-indexing.patch b/target/linux/ixp4xx/patches-2.6.34/603-arm-kluin-array-indexing.patch new file mode 100644 index 0000000000..aca693a41c --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.34/603-arm-kluin-array-indexing.patch @@ -0,0 +1,33 @@ +--- a/arch/arm/kernel/setup.c ++++ b/arch/arm/kernel/setup.c +@@ -322,12 +322,13 @@ static void __init setup_processor(void) + void cpu_init(void) + { + unsigned int cpu = smp_processor_id(); +- struct stack *stk = &stacks[cpu]; ++ struct stack *stk; + + if (cpu >= NR_CPUS) { + printk(KERN_CRIT "CPU%u: bad primary CPU number\n", cpu); + BUG(); + } ++ stk = &stacks[cpu]; + + /* + * Define the placement constraint for the inline asm directive below. +@@ -386,13 +387,14 @@ static struct machine_desc * __init setu + + static int __init arm_add_memory(unsigned long start, unsigned long size) + { +- struct membank *bank = &meminfo.bank[meminfo.nr_banks]; ++ struct membank *bank; + + if (meminfo.nr_banks >= NR_BANKS) { + printk(KERN_CRIT "NR_BANKS too low, " + "ignoring memory at %#lx\n", start); + return -EINVAL; + } ++ bank = &meminfo.bank[meminfo.nr_banks]; + + /* + * Ensure that start/size are aligned to a page boundary. |