diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /arch/parisc/kernel/head.S | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'arch/parisc/kernel/head.S')
| -rw-r--r-- | arch/parisc/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 4dbdf0ed6fa0..145c5e4caaa0 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
| @@ -131,7 +131,7 @@ $pgt_fill_loop: | |||
| 131 | ldo THREAD_SZ_ALGN(%r6),%sp | 131 | ldo THREAD_SZ_ALGN(%r6),%sp |
| 132 | 132 | ||
| 133 | #ifdef CONFIG_SMP | 133 | #ifdef CONFIG_SMP |
| 134 | /* Set the smp rendevous address into page zero. | 134 | /* Set the smp rendezvous address into page zero. |
| 135 | ** It would be safer to do this in init_smp_config() but | 135 | ** It would be safer to do this in init_smp_config() but |
| 136 | ** it's just way easier to deal with here because | 136 | ** it's just way easier to deal with here because |
| 137 | ** of 64-bit function ptrs and the address is local to this file. | 137 | ** of 64-bit function ptrs and the address is local to this file. |