diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/pm.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7ecdda3f1253..9fed5fa194d9 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -328,7 +328,7 @@ static void __init setup_processor(void) | |||
328 | * cpu_init dumps the cache information, initialises SMP specific | 328 | * cpu_init dumps the cache information, initialises SMP specific |
329 | * information, and sets up the per-CPU stacks. | 329 | * information, and sets up the per-CPU stacks. |
330 | */ | 330 | */ |
331 | void __init cpu_init(void) | 331 | void cpu_init(void) |
332 | { | 332 | { |
333 | unsigned int cpu = smp_processor_id(); | 333 | unsigned int cpu = smp_processor_id(); |
334 | struct stack *stk = &stacks[cpu]; | 334 | struct stack *stk = &stacks[cpu]; |
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 9799fe80df23..ac4dd4336160 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
@@ -133,6 +133,8 @@ static int pxa_pm_enter(suspend_state_t state) | |||
133 | /* *** go zzz *** */ | 133 | /* *** go zzz *** */ |
134 | pxa_cpu_pm_enter(state); | 134 | pxa_cpu_pm_enter(state); |
135 | 135 | ||
136 | cpu_init(); | ||
137 | |||
136 | /* after sleeping, validate the checksum */ | 138 | /* after sleeping, validate the checksum */ |
137 | checksum = 0; | 139 | checksum = 0; |
138 | for (i = 0; i < SLEEP_SAVE_SIZE - 1; i++) | 140 | for (i = 0; i < SLEEP_SAVE_SIZE - 1; i++) |
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c index 379ea5e3950f..59c7964cfe11 100644 --- a/arch/arm/mach-sa1100/pm.c +++ b/arch/arm/mach-sa1100/pm.c | |||
@@ -88,6 +88,8 @@ static int sa11x0_pm_enter(suspend_state_t state) | |||
88 | /* go zzz */ | 88 | /* go zzz */ |
89 | sa1100_cpu_suspend(); | 89 | sa1100_cpu_suspend(); |
90 | 90 | ||
91 | cpu_init(); | ||
92 | |||
91 | /* | 93 | /* |
92 | * Ensure not to come back here if it wasn't intended | 94 | * Ensure not to come back here if it wasn't intended |
93 | */ | 95 | */ |