git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
smp.c
diff --git
a/arch/arm/kernel/smp.c
b/arch/arm/kernel/smp.c
index c9a0a529982793ef85bbde11ec646579cd2a7d18..b4fbf00ee4ad527d256c20f055540ae74b8c2b9f 100644
(file)
--- a/
arch/arm/kernel/smp.c
+++ b/
arch/arm/kernel/smp.c
@@
-114,7
+114,7
@@
int __cpu_up(unsigned int cpu, struct task_struct *idle)
*/
secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;
#ifdef CONFIG_ARM_MPU
- secondary_data.mpu_rgn_
szr = mpu_rgn_info.rgns[MPU_RAM_REGION].drsr
;
+ secondary_data.mpu_rgn_
info = &mpu_rgn_info
;
#endif
#ifdef CONFIG_MMU