diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:24:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:24:30 -0400 |
| commit | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (patch) | |
| tree | 39a93460aa2c6eb8286fbba6c551f95443e175dd /arch/x86/kernel/cpu | |
| parent | 9042763808c5285a1a61b45b0fe98a710a4c903c (diff) | |
| parent | 63cc8c75156462d4b42cbdd76c293b7eee7ddbfe (diff) | |
Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
"percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"
into x86/core
Conflicts:
arch/x86/kernel/cpu/common.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 008c73796bbb..7d5a07f0fd24 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | static struct cpu_dev *this_cpu __cpuinitdata; | 25 | static struct cpu_dev *this_cpu __cpuinitdata; |
| 26 | 26 | ||
| 27 | DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = { | 27 | DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { |
| 28 | [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } }, | 28 | [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } }, |
| 29 | [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } }, | 29 | [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } }, |
| 30 | [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00cffa00 } } }, | 30 | [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00cffa00 } } }, |