Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a57ff1a authored by Rusty Russell's avatar Rusty Russell Committed by Andi Kleen
Browse files

[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: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>

===================================================================
parent 105fddb8

arch/i386/kernel/head.S

+3 −3
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ is386: movl $2,%ecx # set MP 


	call check_x87

	call setup_pda

	lgdt cpu_gdt_descr

	lgdt early_gdt_descr

	lidt idt_descr

	ljmp $(__KERNEL_CS),$1f

1:	movl $(__KERNEL_DS),%eax	# reload all the segment registers
@@ -375,7 +375,7 @@ ENTRY(setup_pda) 
	movl start_pda, %eax



	/* slot the PDA address into the GDT */

	mov cpu_gdt_descr+2, %ecx

	mov early_gdt_descr+2, %ecx

	mov %ax, (__KERNEL_PDA+0+2)(%ecx)		/* base & 0x0000ffff */

	shr $16, %eax

	mov %al, (__KERNEL_PDA+4+0)(%ecx)		/* base & 0x00ff0000 */
@@ -597,7 +597,7 @@ idt_descr: 


# boot GDT descriptor (later on used by CPU#0):

	.word 0				# 32 bit align gdt_desc.address

ENTRY(cpu_gdt_descr)

ENTRY(early_gdt_descr)

	.word GDT_ENTRIES*8-1

	.long cpu_gdt_table

arch/i386/kernel/smpboot.c

+0 −1
Original line number Diff line number Diff line
@@ -623,7 +623,6 @@ extern struct { 
	unsigned short ss;

} stack_start;

extern struct i386_pda *start_pda;

extern struct Xgt_desc_struct cpu_gdt_descr;



#ifdef CONFIG_NUMA

include/asm-i386/desc.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct Xgt_desc_struct { 


extern struct Xgt_desc_struct idt_descr;

DECLARE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr);



extern struct Xgt_desc_struct early_gdt_descr;



static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)

{