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

Commit 24933b82 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/asm/entry: Rename 'init_tss' to 'cpu_tss' 



It has nothing to do with init -- there's only one TSS per cpu.

Other names considered include:

 - current_tss: Confusing because we never switch the tss.
 - singleton_tss: Too long.

This patch was generated with 's/init_tss/cpu_tss/g'.  Followup
patches will fix INIT_TSS and INIT_TSS_IST by hand.

Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/da29fb2a793e4f649d93ce2d1ed320ebe8516262.1425611534.git.luto@amacapital.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9d0c914c

arch/x86/ia32/ia32entry.S

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ ENTRY(ia32_sysenter_target) 
	CFI_DEF_CFA	rsp,0

	CFI_REGISTER	rsp,rbp

	SWAPGS_UNSAFE_STACK

	movq	PER_CPU_VAR(init_tss + TSS_sp0), %rsp

	movq	PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp

	/*

	 * No need to follow this irqs on/off section: the syscall

	 * disabled irqs, here we enable it straight after entry:

arch/x86/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ struct tss_struct { 


} ____cacheline_aligned;



DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);

DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);



/*

 * Save the original ist values for checking stack pointers during debugging
@@ -566,7 +566,7 @@ static inline void native_swapgs(void) 


static inline unsigned long this_cpu_sp0(void)

{

	return this_cpu_read_stable(init_tss.x86_tss.sp0);

	return this_cpu_read_stable(cpu_tss.x86_tss.sp0);

}



#ifdef CONFIG_PARAVIRT

arch/x86/kernel/cpu/common.c

+3 −3
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ static void syscall32_cpu_init(void) 
void enable_sep_cpu(void)

{

	int cpu = get_cpu();

	struct tss_struct *tss = &per_cpu(init_tss, cpu);

	struct tss_struct *tss = &per_cpu(cpu_tss, cpu);



	if (!boot_cpu_has(X86_FEATURE_SEP)) {

		put_cpu();
@@ -1307,7 +1307,7 @@ void cpu_init(void) 
	 */

	load_ucode_ap();



	t = &per_cpu(init_tss, cpu);

	t = &per_cpu(cpu_tss, cpu);

	oist = &per_cpu(orig_ist, cpu);



#ifdef CONFIG_NUMA
@@ -1391,7 +1391,7 @@ void cpu_init(void) 
{

	int cpu = smp_processor_id();

	struct task_struct *curr = current;

	struct tss_struct *t = &per_cpu(init_tss, cpu);

	struct tss_struct *t = &per_cpu(cpu_tss, cpu);

	struct thread_struct *thread = &curr->thread;



	wait_for_master_cpu(cpu);

arch/x86/kernel/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ apicinterrupt IRQ_WORK_VECTOR \ 
/*

 * Exception entry points.

 */

#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)

#define INIT_TSS_IST(x) PER_CPU_VAR(cpu_tss) + (TSS_ist + ((x) - 1) * 8)



.macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1

ENTRY(\sym)

arch/x86/kernel/ioport.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) 
	 * because the ->io_bitmap_max value must match the bitmap

	 * contents:

	 */

	tss = &per_cpu(init_tss, get_cpu());

	tss = &per_cpu(cpu_tss, get_cpu());



	if (turn_on)

		bitmap_clear(t->io_bitmap_ptr, from, num);