lkml.org 
[lkml]   [2009]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/4] x86: remove unused patch_espfix_desc()
    patch_espfix_desc() is not used after commit
    dc4c2a0aed3b09f6e255bd5c3faa50fe6e0b2ded

    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    ---
    arch/x86/include/asm/traps.h | 4 +---
    arch/x86/kernel/traps.c | 21 ---------------------
    2 files changed, 1 insertions(+), 24 deletions(-)

    diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
    index bfd74c0..4da91ad 100644
    --- a/arch/x86/include/asm/traps.h
    +++ b/arch/x86/include/asm/traps.h
    @@ -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
    diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
    index 5204332..2367941 100644
    --- a/arch/x86/kernel/traps.c
    +++ b/arch/x86/kernel/traps.c
    @@ -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)
    {
    }
    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-07-18 17:15    [W:5.291 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site