aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2007-02-13 07:26:26 -0500
committerAndi Kleen <andi@basil.nowhere.org>2007-02-13 07:26:26 -0500
commit2a57ff1a7051f0936b57342a57c25658d7ca3cc6 (patch)
tree1428192cff1ffae1e454548a7a41189020bcde23
parent105fddb862d3da2f414329ff7719794fb2bd706b (diff)
[PATCH] i386: Rename cpu_gdt_descr and remove extern declaration from smpboot.c
When I implemented the DECLARE_PER_CPU(var) macros, I was careful that people couldn't use "var" in a non-percpu context, by prepending percpu__. I never considered that this would allow them to overload the same name for a per-cpu and a non-percpu variable. It is only one of many horrors in the i386 boot code, but let's rename the non-perpcu cpu_gdt_descr to early_gdt_descr (not boot_gdt_descr, that's something else...) Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andi Kleen <ak@suse.de> ===================================================================
-rw-r--r--arch/i386/kernel/head.S6
-rw-r--r--arch/i386/kernel/smpboot.c1
-rw-r--r--include/asm-i386/desc.h2
3 files changed, 4 insertions, 5 deletions
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index b322f72ffaad..3fa7f9389afe 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -319,7 +319,7 @@ is386: movl $2,%ecx # set MP
319 319
320 call check_x87 320 call check_x87
321 call setup_pda 321 call setup_pda
322 lgdt cpu_gdt_descr 322 lgdt early_gdt_descr
323 lidt idt_descr 323 lidt idt_descr
324 ljmp $(__KERNEL_CS),$1f 324 ljmp $(__KERNEL_CS),$1f
3251: movl $(__KERNEL_DS),%eax # reload all the segment registers 3251: movl $(__KERNEL_DS),%eax # reload all the segment registers
@@ -375,7 +375,7 @@ ENTRY(setup_pda)
375 movl start_pda, %eax 375 movl start_pda, %eax
376 376
377 /* slot the PDA address into the GDT */ 377 /* slot the PDA address into the GDT */
378 mov cpu_gdt_descr+2, %ecx 378 mov early_gdt_descr+2, %ecx
379 mov %ax, (__KERNEL_PDA+0+2)(%ecx) /* base & 0x0000ffff */ 379 mov %ax, (__KERNEL_PDA+0+2)(%ecx) /* base & 0x0000ffff */
380 shr $16, %eax 380 shr $16, %eax
381 mov %al, (__KERNEL_PDA+4+0)(%ecx) /* base & 0x00ff0000 */ 381 mov %al, (__KERNEL_PDA+4+0)(%ecx) /* base & 0x00ff0000 */
@@ -597,7 +597,7 @@ idt_descr:
597 597
598# boot GDT descriptor (later on used by CPU#0): 598# boot GDT descriptor (later on used by CPU#0):
599 .word 0 # 32 bit align gdt_desc.address 599 .word 0 # 32 bit align gdt_desc.address
600ENTRY(cpu_gdt_descr) 600ENTRY(early_gdt_descr)
601 .word GDT_ENTRIES*8-1 601 .word GDT_ENTRIES*8-1
602 .long cpu_gdt_table 602 .long cpu_gdt_table
603 603
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 5a00b07e7194..f46a4d095e6c 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -623,7 +623,6 @@ extern struct {
623 unsigned short ss; 623 unsigned short ss;
624} stack_start; 624} stack_start;
625extern struct i386_pda *start_pda; 625extern struct i386_pda *start_pda;
626extern struct Xgt_desc_struct cpu_gdt_descr;
627 626
628#ifdef CONFIG_NUMA 627#ifdef CONFIG_NUMA
629 628
diff --git a/include/asm-i386/desc.h b/include/asm-i386/desc.h
index f398cc456448..050831f34f71 100644
--- a/include/asm-i386/desc.h
+++ b/include/asm-i386/desc.h
@@ -22,7 +22,7 @@ struct Xgt_desc_struct {
22 22
23extern struct Xgt_desc_struct idt_descr; 23extern struct Xgt_desc_struct idt_descr;
24DECLARE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr); 24DECLARE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr);
25 25extern struct Xgt_desc_struct early_gdt_descr;
26 26
27static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) 27static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
28{ 28{