diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-06-22 14:10:55 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-06-22 14:10:55 +0000 |
commit | 49a46722488ee4886ea97f070e4920d49d32d788 (patch) | |
tree | 4bbd346373476ec4887007d1edff38603bc09b1f /target/linux/ixp4xx/patches-2.6.35/603-arm-kluin-array-indexing.patch | |
parent | 7600086eb4fda3e204bac33247b6e06c5355823e (diff) | |
download | upstream-49a46722488ee4886ea97f070e4920d49d32d788.tar.gz upstream-49a46722488ee4886ea97f070e4920d49d32d788.tar.bz2 upstream-49a46722488ee4886ea97f070e4920d49d32d788.zip |
ixp4xx: add Mikael Petterssons patch works for 2.6.33 & 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21879 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.35/603-arm-kluin-array-indexing.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.35/603-arm-kluin-array-indexing.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.35/603-arm-kluin-array-indexing.patch b/target/linux/ixp4xx/patches-2.6.35/603-arm-kluin-array-indexing.patch new file mode 100644 index 0000000000..3a8c80d742 --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.35/603-arm-kluin-array-indexing.patch @@ -0,0 +1,33 @@ +--- a/arch/arm/kernel/setup.c ++++ b/arch/arm/kernel/setup.c +@@ -323,12 +323,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. +@@ -387,13 +388,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. |