12 files changed, 71 insertions, 58 deletions

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 1629c3ac9bee..89ebb7a316ab 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -197,7 +197,7 @@ CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION="/dev/hda2"
+CONFIG_PM_STD_PARTITION=""
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 48f0f62f781c..5b96f038367f 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -90,7 +90,7 @@ static void crash_save_self(struct pt_regs *regs)
         crash_save_this_cpu(regs, cpu);
 }
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
 static atomic_t waiting_for_crash_ipi;
 
 static int crash_nmi_callback(struct pt_regs *regs, int cpu)
diff --git a/arch/i386/kernel/ioport.c b/arch/i386/kernel/ioport.c
index 79026f026b85..498e8bc197d5 100644
--- a/arch/i386/kernel/ioport.c
+++ b/arch/i386/kernel/ioport.c
@@ -79,6 +79,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
 
                 memset(bitmap, 0xff, IO_BITMAP_BYTES);
                 t->io_bitmap_ptr = bitmap;
+                set_thread_flag(TIF_IO_BITMAP);
         }
 
         /*
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 94e2c87edeaa..923bb292f47f 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -359,16 +359,16 @@ EXPORT_SYMBOL(kernel_thread);
  */
 void exit_thread(void)
 {
-        struct task_struct *tsk = current;
-        struct thread_struct *t = &tsk->thread;
-
         /* The process may have allocated an io port bitmap... nuke it. */
-        if (unlikely(NULL != t->io_bitmap_ptr)) {
+        if (unlikely(test_thread_flag(TIF_IO_BITMAP))) {
+                struct task_struct *tsk = current;
+                struct thread_struct *t = &tsk->thread;
                 int cpu = get_cpu();
                 struct tss_struct *tss = &per_cpu(init_tss, cpu);
 
                 kfree(t->io_bitmap_ptr);
                 t->io_bitmap_ptr = NULL;
+                clear_thread_flag(TIF_IO_BITMAP);
                 /*
                  * Careful, clear this in the TSS too:
                  */
@@ -387,6 +387,7 @@ void flush_thread(void)
 
         memset(tsk->thread.debugreg, 0, sizeof(unsigned long)*8);
         memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));        
+        clear_tsk_thread_flag(tsk, TIF_DEBUG);
         /*
          * Forget coprocessor state..
          */
@@ -431,7 +432,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,
         savesegment(gs,p->thread.gs);
 
         tsk = current;
-        if (unlikely(NULL != tsk->thread.io_bitmap_ptr)) {
+        if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {
                 p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL);
                 if (!p->thread.io_bitmap_ptr) {
                         p->thread.io_bitmap_max = 0;
@@ -439,6 +440,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,
                 }
                 memcpy(p->thread.io_bitmap_ptr, tsk->thread.io_bitmap_ptr,
                         IO_BITMAP_BYTES);
+                set_tsk_thread_flag(p, TIF_IO_BITMAP);
         }
 
         /*
@@ -533,10 +535,24 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
         return 1;
 }
 
-static inline void
-handle_io_bitmap(struct thread_struct *next, struct tss_struct *tss)
+static noinline void __switch_to_xtra(struct task_struct *next_p,
+                                    struct tss_struct *tss)
 {
-        if (!next->io_bitmap_ptr) {
+        struct thread_struct *next;
+
+        next = &next_p->thread;
+
+        if (test_tsk_thread_flag(next_p, TIF_DEBUG)) {
+                set_debugreg(next->debugreg[0], 0);
+                set_debugreg(next->debugreg[1], 1);
+                set_debugreg(next->debugreg[2], 2);
+                set_debugreg(next->debugreg[3], 3);
+                /* no 4 and 5 */
+                set_debugreg(next->debugreg[6], 6);
+                set_debugreg(next->debugreg[7], 7);
+        }
+
+        if (!test_tsk_thread_flag(next_p, TIF_IO_BITMAP)) {
                 /*
                  * Disable the bitmap via an invalid offset. We still cache
                  * the previous bitmap owner and the IO bitmap contents:
@@ -544,6 +560,7 @@ handle_io_bitmap(struct thread_struct *next, struct tss_struct *tss)
                 tss->io_bitmap_base = INVALID_IO_BITMAP_OFFSET;
                 return;
         }
+
         if (likely(next == tss->io_bitmap_owner)) {
                 /*
                  * Previous owner of the bitmap (hence the bitmap content)
@@ -671,20 +688,11 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
                 set_iopl_mask(next->iopl);
 
         /*
-         * Now maybe reload the debug registers
+         * Now maybe handle debug registers and/or IO bitmaps
          */
-        if (unlikely(next->debugreg[7])) {
-                set_debugreg(next->debugreg[0], 0);
-                set_debugreg(next->debugreg[1], 1);
-                set_debugreg(next->debugreg[2], 2);
-                set_debugreg(next->debugreg[3], 3);
-                /* no 4 and 5 */
-                set_debugreg(next->debugreg[6], 6);
-                set_debugreg(next->debugreg[7], 7);
-        }
-
-        if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr))
-                handle_io_bitmap(next, tss);
+        if (unlikely((task_thread_info(next_p)->flags & _TIF_WORK_CTXSW))
+            || test_tsk_thread_flag(prev_p, TIF_IO_BITMAP))
+                __switch_to_xtra(next_p, tss);
 
         disable_tsc(prev_p, next_p);
 
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index fd7eaf7866e0..d3db03f4085d 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -468,8 +468,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                   for(i=0; i<4; i++)
                                           if ((0x5f54 >> ((data >> (16 + 4*i)) & 0xf)) & 1)
                                                   goto out_tsk;
+                                  if (data)
+                                          set_tsk_thread_flag(child, TIF_DEBUG);
+                                  else
+                                          clear_tsk_thread_flag(child, TIF_DEBUG);
                           }
-
                           addr -= (long) &dummy->u_debugreg;
                           addr = addr >> 2;
                           child->thread.debugreg[addr] = data;
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 08c00d20f162..f1682206d304 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -26,7 +26,7 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 #include <linux/ioport.h>
 #include <linux/acpi.h>
 #include <linux/apm_bios.h>
@@ -1327,7 +1327,10 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
                 res->start = e820.map[i].addr;
                 res->end = res->start + e820.map[i].size - 1;
                 res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-                request_resource(&iomem_resource, res);
+                if (request_resource(&iomem_resource, res)) {
+                        kfree(res);
+                        continue;
+                }
                 if (e820.map[i].type == E820_RAM) {
                         /*
                          *  We don't know which RAM region contains kernel data,
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 316421a7f56f..8705c0f05788 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -206,15 +206,16 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 unsigned long get_cmos_time(void)
 {
         unsigned long retval;
+        unsigned long flags;
 
-        spin_lock(&rtc_lock);
+        spin_lock_irqsave(&rtc_lock, flags);
 
         if (efi_enabled)
                 retval = efi_get_time();
         else
                 retval = mach_get_cmos_time();
 
-        spin_unlock(&rtc_lock);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return retval;
 }
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 2bf8b55b91f8..313ac1f7dc5a 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -100,13 +100,13 @@ int register_die_notifier(struct notifier_block *nb)
         vmalloc_sync_all();
         return atomic_notifier_chain_register(&i386die_chain, nb);
 }
-EXPORT_SYMBOL(register_die_notifier);
+EXPORT_SYMBOL(register_die_notifier); /* used modular by kdb */
 
 int unregister_die_notifier(struct notifier_block *nb)
 {
         return atomic_notifier_chain_unregister(&i386die_chain, nb);
 }
-EXPORT_SYMBOL(unregister_die_notifier);
+EXPORT_SYMBOL(unregister_die_notifier); /* used modular by kdb */
 
 static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)
 {
@@ -324,35 +324,35 @@ void show_registers(struct pt_regs *regs)
 
 static void handle_BUG(struct pt_regs *regs)
 {
+        unsigned long eip = regs->eip;
         unsigned short ud2;
-        unsigned short line;
-        char *file;
-        char c;
-        unsigned long eip;
-
-        eip = regs->eip;
 
         if (eip < PAGE_OFFSET)
-                goto no_bug;
+                return;
         if (__get_user(ud2, (unsigned short __user *)eip))
-                goto no_bug;
+                return;
         if (ud2 != 0x0b0f)
-                goto no_bug;
-        if (__get_user(line, (unsigned short __user *)(eip + 2)))
-                goto bug;
-        if (__get_user(file, (char * __user *)(eip + 4)) ||
-                (unsigned long)file < PAGE_OFFSET || __get_user(c, file))
-                file = "<bad filename>";
+                return;
 
         printk(KERN_EMERG "------------[ cut here ]------------\n");
-        printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);
 
-no_bug:
-        return;
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+        do {
+                unsigned short line;
+                char *file;
+                char c;
 
-        /* Here we know it was a BUG but file-n-line is unavailable */
-bug:
-        printk(KERN_EMERG "Kernel BUG\n");
+                if (__get_user(line, (unsigned short __user *)(eip + 2)))
+                        break;
+                if (__get_user(file, (char * __user *)(eip + 4)) ||
+                    (unsigned long)file < PAGE_OFFSET || __get_user(c, file))
+                        file = "<bad filename>";
+
+                printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);
+                return;
+        } while (0);
+#endif
+        printk(KERN_EMERG "Kernel BUG at [verbose debug info unavailable]\n");
 }
 
 /* This is gone through when something in the kernel
diff --git a/arch/i386/lib/usercopy.c b/arch/i386/lib/usercopy.c
index 4b75212ab6dd..efc7e7d5f4d0 100644
--- a/arch/i386/lib/usercopy.c
+++ b/arch/i386/lib/usercopy.c
@@ -843,7 +843,6 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
 unsigned long
 copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-        might_sleep();
         BUG_ON((long) n < 0);
         if (access_ok(VERIFY_WRITE, to, n))
                 n = __copy_to_user(to, from, n);
@@ -870,7 +869,6 @@ EXPORT_SYMBOL(copy_to_user);
 unsigned long
 copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-        might_sleep();
         BUG_ON((long) n < 0);
         if (access_ok(VERIFY_READ, from, n))
                 n = __copy_from_user(to, from, n);
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c
index fa8a37bcb391..c8c1df8ff2b4 100644
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
@@ -13,6 +13,7 @@
 #include <linux/oprofile.h>
 #include <linux/sysdev.h>
 #include <linux/slab.h>
+#include <linux/moduleparam.h>
 #include <asm/nmi.h>
 #include <asm/msr.h>
 #include <asm/apic.h>
@@ -296,12 +297,14 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root)
         return 0;
 }
  
+static int p4force;
+module_param(p4force, int, 0);
  
 static int __init p4_init(char ** cpu_type)
 {
         __u8 cpu_model = boot_cpu_data.x86_model;
 
-        if (cpu_model > 4)
+        if (!p4force && (cpu_model > 6 || cpu_model == 5))
                 return 0;
 
 #ifndef CONFIG_SMP
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index c624b61e1104..0a362e3aeac5 100644
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -17,10 +17,6 @@
 
 #include "pci.h"
 
-#ifdef CONFIG_PCI_BIOS
-extern  void pcibios_sort(void);
-#endif
-
 unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
                                 PCI_PROBE_MMCONF;
 
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h
index 12bf3d8dda29..bf4e79335388 100644
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
@@ -84,4 +84,4 @@ extern int pci_conf1_read(unsigned int seg, unsigned int bus,
 extern void pci_direct_init(void);
 extern void pci_pcbios_init(void);
 extern void pci_mmcfg_init(void);
-
+extern void pcibios_sort(void);