diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
| commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
| tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /arch/x86/kernel/head64.c | |
| parent | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/x86/kernel/head64.c')
| -rw-r--r-- | arch/x86/kernel/head64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 388e05a5fc1..b9a4d8c4b93 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <asm/trampoline.h> | 27 | #include <asm/trampoline.h> |
| 28 | 28 | ||
| 29 | /* boot cpu pda */ | 29 | /* boot cpu pda */ |
| 30 | static struct x8664_pda _boot_cpu_pda __read_mostly; | 30 | static struct x8664_pda _boot_cpu_pda; |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_SMP | 32 | #ifdef CONFIG_SMP |
| 33 | /* | 33 | /* |