1 files changed, 21 insertions, 33 deletions

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 1e9d57256eb1..cc9acace7e23 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -63,6 +63,9 @@
 
 int panic_on_unrecovered_nmi;
 
+DECLARE_BITMAP(used_vectors, NR_VECTORS);
+EXPORT_SYMBOL_GPL(used_vectors);
+
 asmlinkage int system_call(void);
 
 /* Do we ignore FPU interrupts ? */
@@ -288,33 +291,9 @@ EXPORT_SYMBOL(dump_stack);
 void show_registers(struct pt_regs *regs)
 {
         int i;
-        int in_kernel = 1;
-        unsigned long esp;
-        unsigned short ss, gs;
-
-        esp = (unsigned long) (&regs->esp);
-        savesegment(ss, ss);
-        savesegment(gs, gs);
-        if (user_mode_vm(regs)) {
-                in_kernel = 0;
-                esp = regs->esp;
-                ss = regs->xss & 0xffff;
-        }
+
         print_modules();
-        printk(KERN_EMERG "CPU:    %d\n"
-                KERN_EMERG "EIP:    %04x:[<%08lx>]    %s VLI\n"
-                KERN_EMERG "EFLAGS: %08lx   (%s %.*s)\n",
-                smp_processor_id(), 0xffff & regs->xcs, regs->eip,
-                print_tainted(), regs->eflags, init_utsname()->release,
-                (int)strcspn(init_utsname()->version, " "),
-                init_utsname()->version);
-        print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip);
-        printk(KERN_EMERG "eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
-                regs->eax, regs->ebx, regs->ecx, regs->edx);
-        printk(KERN_EMERG "esi: %08lx   edi: %08lx   ebp: %08lx   esp: %08lx\n",
-                regs->esi, regs->edi, regs->ebp, esp);
-        printk(KERN_EMERG "ds: %04x   es: %04x   fs: %04x  gs: %04x  ss: %04x\n",
-               regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);
+        __show_registers(regs, 0);
         printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
                 TASK_COMM_LEN, current->comm, task_pid_nr(current),
                 current_thread_info(), current, task_thread_info(current));
@@ -322,14 +301,14 @@ void show_registers(struct pt_regs *regs)
          * When in-kernel, we also print out the stack and code at the
          * time of the fault..
          */
-        if (in_kernel) {
+        if (!user_mode_vm(regs)) {
                 u8 *eip;
                 unsigned int code_prologue = code_bytes * 43 / 64;
                 unsigned int code_len = code_bytes;
                 unsigned char c;
 
                 printk("\n" KERN_EMERG "Stack: ");
-                show_stack_log_lvl(NULL, regs, (unsigned long *)esp, KERN_EMERG);
+                show_stack_log_lvl(NULL, regs, &regs->esp, KERN_EMERG);
 
                 printk(KERN_EMERG "Code: ");
 
@@ -374,11 +353,11 @@ int is_valid_bugaddr(unsigned long eip)
 void die(const char * str, struct pt_regs * regs, long err)
 {
         static struct {
-                spinlock_t lock;
+                raw_spinlock_t lock;
                 u32 lock_owner;
                 int lock_owner_depth;
         } die = {
-                .lock =                 __SPIN_LOCK_UNLOCKED(die.lock),
+                .lock =                 __RAW_SPIN_LOCK_UNLOCKED,
                 .lock_owner =           -1,
                 .lock_owner_depth =     0
         };
@@ -389,13 +368,14 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         if (die.lock_owner != raw_smp_processor_id()) {
                 console_verbose();
-                spin_lock_irqsave(&die.lock, flags);
+                __raw_spin_lock(&die.lock);
+                raw_local_save_flags(flags);
                 die.lock_owner = smp_processor_id();
                 die.lock_owner_depth = 0;
                 bust_spinlocks(1);
         }
         else
-                local_save_flags(flags);
+                raw_local_save_flags(flags);
 
         if (++die.lock_owner_depth < 3) {
                 unsigned long esp;
@@ -439,7 +419,8 @@ void die(const char * str, struct pt_regs * regs, long err)
         bust_spinlocks(0);
         die.lock_owner = -1;
         add_taint(TAINT_DIE);
-        spin_unlock_irqrestore(&die.lock, flags);
+        __raw_spin_unlock(&die.lock);
+        raw_local_irq_restore(flags);
 
         if (!regs)
                 return;
@@ -1142,6 +1123,8 @@ static void __init set_task_gate(unsigned int n, unsigned int gdt_entry)
 
 void __init trap_init(void)
 {
+        int i;
+
 #ifdef CONFIG_EISA
         void __iomem *p = ioremap(0x0FFFD9, 4);
         if (readl(p) == 'E'+('I'<<8)+('S'<<16)+('A'<<24)) {
@@ -1201,6 +1184,11 @@ void __init trap_init(void)
 
         set_system_gate(SYSCALL_VECTOR,&system_call);
 
+        /* Reserve all the builtin and the syscall vector. */
+        for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
+                set_bit(i, used_vectors);
+        set_bit(SYSCALL_VECTOR, used_vectors);
+
         /*
          * Should be a barrier for any external CPU state.
          */