Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 18 insertions, 10 deletions

diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 859ebf4da632..79dfab87135d 100644
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -41,13 +41,17 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
+        if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
+                switch(index) {
+                        case 2: return 0x1e8;
+                        case 3: return 0x168;
+                        case 4: return 0x1e0;
+                        case 5: return 0x160;
+                }
+        }
         switch (index) {
                 case 0: return 0x1f0;
                 case 1: return 0x170;
-                case 2: return 0x1e8;
-                case 3: return 0x168;
-                case 4: return 0x1e0;
-                case 5: return 0x160;
                 default:
                         return 0;
         }
diff --git a/include/asm-i386/tlbflush.h b/include/asm-i386/tlbflush.h
index f22fab0cea26..ab216e1370ef 100644
--- a/include/asm-i386/tlbflush.h
+++ b/include/asm-i386/tlbflush.h
@@ -22,16 +22,18 @@
  */
 #define __flush_tlb_global()                                            \
         do {                                                            \
-                unsigned int tmpreg;                                    \
+                unsigned int tmpreg, cr4, cr4_orig;                     \
                                                                         \
                 __asm__ __volatile__(                                   \
-                        "movl %1, %%cr4;  # turn off PGE     \n"        \
+                        "movl %%cr4, %2;  # turn off PGE     \n"        \
+                        "movl %2, %1;                        \n"        \
+                        "andl %3, %1;                        \n"        \
+                        "movl %1, %%cr4;                     \n"        \
                         "movl %%cr3, %0;                     \n"        \
                         "movl %0, %%cr3;  # flush TLB        \n"        \
                         "movl %2, %%cr4;  # turn PGE back on \n"        \
-                        : "=&r" (tmpreg)                                \
-                        : "r" (mmu_cr4_features & ~X86_CR4_PGE),        \
-                          "r" (mmu_cr4_features)                        \
+                        : "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig) \
+                        : "i" (~X86_CR4_PGE)                            \
                         : "memory");                                    \
         } while (0)
 
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 176413fb9ae3..e25e4c71a879 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -294,8 +294,10 @@
 #define __NR_add_key            286
 #define __NR_request_key        287
 #define __NR_keyctl             288
+#define __NR_ioprio_set         289
+#define __NR_ioprio_get         290
 
-#define NR_syscalls 289
+#define NR_syscalls 291
 
 /*
  * user-visible error numbers are in the range -1 - -128: see