1 files changed, 8 insertions, 29 deletions

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 05c27ecaf2a7..b132d3957dfc 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -112,7 +112,7 @@ struct stack_frame {
 
 static inline unsigned long print_context_stack(struct thread_info *tinfo,
                                 unsigned long *stack, unsigned long ebp,
-                                struct stacktrace_ops *ops, void *data)
+                                const struct stacktrace_ops *ops, void *data)
 {
 #ifdef  CONFIG_FRAME_POINTER
         struct stack_frame *frame = (struct stack_frame *)ebp;
@@ -149,7 +149,7 @@ static inline unsigned long print_context_stack(struct thread_info *tinfo,
 
 void dump_trace(struct task_struct *task, struct pt_regs *regs,
                 unsigned long *stack,
-                struct stacktrace_ops *ops, void *data)
+                const struct stacktrace_ops *ops, void *data)
 {
         unsigned long ebp = 0;
 
@@ -221,7 +221,7 @@ static void print_trace_address(void *data, unsigned long addr)
         touch_nmi_watchdog();
 }
 
-static struct stacktrace_ops print_trace_ops = {
+static const struct stacktrace_ops print_trace_ops = {
         .warning = print_trace_warning,
         .warning_symbol = print_trace_warning_symbol,
         .stack = print_trace_stack,
@@ -398,31 +398,24 @@ void die(const char * str, struct pt_regs * regs, long err)
                 local_save_flags(flags);
 
         if (++die.lock_owner_depth < 3) {
-                int nl = 0;
                 unsigned long esp;
                 unsigned short ss;
 
                 report_bug(regs->eip, regs);
 
-                printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
+                printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff,
+                       ++die_counter);
 #ifdef CONFIG_PREEMPT
-                printk(KERN_EMERG "PREEMPT ");
-                nl = 1;
+                printk("PREEMPT ");
 #endif
 #ifdef CONFIG_SMP
-                if (!nl)
-                        printk(KERN_EMERG);
                 printk("SMP ");
-                nl = 1;
 #endif
 #ifdef CONFIG_DEBUG_PAGEALLOC
-                if (!nl)
-                        printk(KERN_EMERG);
                 printk("DEBUG_PAGEALLOC");
-                nl = 1;
 #endif
-                if (nl)
-                        printk("\n");
+                printk("\n");
+
                 if (notify_die(DIE_OOPS, str, regs, err,
                                         current->thread.trap_no, SIGSEGV) !=
                                 NOTIFY_STOP) {
@@ -1112,20 +1105,6 @@ asmlinkage void math_emulate(long arg)
 
 #endif /* CONFIG_MATH_EMULATION */
 
-#ifdef CONFIG_X86_F00F_BUG
-void __init trap_init_f00f_bug(void)
-{
-        __set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
-
-        /*
-         * Update the IDT descriptor and reload the IDT so that
-         * it uses the read-only mapped virtual address.
-         */
-        idt_descr.address = fix_to_virt(FIX_F00F_IDT);
-        load_idt(&idt_descr);
-}
-#endif
-
 /*
  * This needs to use 'idt_table' rather than 'idt', and
  * thus use the _nonmapped_ version of the IDT, as the