Commit fde0312d authored by Akinobu Mita's avatar Akinobu Mita Committed by Ingo Molnar
Browse files

x86: Remove unused patch_espfix_desc() 



patch_espfix_desc() is not used after commit
dc4c2a0a

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
LKML-Reference: <20090718150955.GB11294@localhost.localdomain>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 254e0a6b

arch/x86/include/asm/traps.h

+1 −3
Original line number Diff line number Diff line
@@ -81,9 +81,7 @@ extern int panic_on_unrecovered_nmi; 


void math_error(void __user *);

void math_emulate(struct math_emu_info *);

#ifdef CONFIG_X86_32

unsigned long patch_espfix_desc(unsigned long, unsigned long);

#else

#ifndef CONFIG_X86_32

asmlinkage void smp_thermal_interrupt(void);

asmlinkage void mce_threshold_interrupt(void);

#endif

arch/x86/kernel/traps.c

+0 −21
Original line number Diff line number Diff line
@@ -786,27 +786,6 @@ do_spurious_interrupt_bug(struct pt_regs *regs, long error_code) 
#endif

}



#ifdef CONFIG_X86_32

unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp)

{

	struct desc_struct *gdt = get_cpu_gdt_table(smp_processor_id());

	unsigned long base = (kesp - uesp) & -THREAD_SIZE;

	unsigned long new_kesp = kesp - base;

	unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;

	__u64 desc = *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS];



	/* Set up base for espfix segment */

	desc &= 0x00f0ff0000000000ULL;

	desc |=	((((__u64)base) << 16) & 0x000000ffffff0000ULL) |

		((((__u64)base) << 32) & 0xff00000000000000ULL) |

		((((__u64)lim_pages) << 32) & 0x000f000000000000ULL) |

		(lim_pages & 0xffff);

	*(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS] = desc;



	return new_kesp;

}

#endif



asmlinkage void __attribute__((weak)) smp_thermal_interrupt(void)

{

}