aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-06-22 14:10:55 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-06-22 14:10:55 +0000
commitf2bf29dcfbad674c78351172b4bcbb4e87a554a8 (patch)
treef9eb20701b1a6e36c40849dd56715089f973540f /target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch
parenta9783bd1c11a99feffb7a53d6f194e33bead63f5 (diff)
downloadupstream-f2bf29dcfbad674c78351172b4bcbb4e87a554a8.tar.gz
upstream-f2bf29dcfbad674c78351172b4bcbb4e87a554a8.tar.bz2
upstream-f2bf29dcfbad674c78351172b4bcbb4e87a554a8.zip
ixp4xx: add Mikael Petterssons patch works for 2.6.33 & 2.6.35
SVN-Revision: 21879
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch b/target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch
new file mode 100644
index 0000000000..aca693a41c
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.33/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.