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

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (78 commits)
  x86: fix RTC lockdep warning: potential hardirq recursion
  x86: cpa, micro-optimization
  x86: cpa, clean up code flow
  x86: cpa, eliminate CPA_ enum
  x86: cpa, cleanups
  x86: implement gbpages support in change_page_attr()
  x86: support gbpages in pagetable dump
  x86: add gbpages support to lookup_address
  x86: add pgtable accessor functions for gbpages
  x86: add PUD_PAGE_SIZE
  x86: add feature macros for the gbpages cpuid bit
  x86: switch direct mapping setup over to set_pte
  x86: fix page-present check in cpa_flush_range
  x86: remove cpa warning
  x86: remove now unused clear_kernel_mapping
  x86: switch pci-gart over to using set_memory_np() instead of clear_kernel_mapping()
  x86: cpa selftest, skip non present entries
  x86: CPA fix pagetable split
  x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE
  x86: cpa, fix lookup_address
  ...

1 files changed, 4 insertions, 12 deletions

diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h
index ba8105ca822b..6b1895ccd6b7 100644
--- a/include/asm-x86/i387.h
+++ b/include/asm-x86/i387.h
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 #include <linux/kernel_stat.h>
 #include <linux/regset.h>
+#include <asm/asm.h>
 #include <asm/processor.h>
 #include <asm/sigcontext.h>
 #include <asm/user.h>
@@ -41,10 +42,7 @@ static inline void tolerant_fwait(void)
 {
         asm volatile("1: fwait\n"
                      "2:\n"
-                     "   .section __ex_table,\"a\"\n"
-                     "  .align 8\n"
-                     "  .quad 1b,2b\n"
-                     "  .previous\n");
+                     _ASM_EXTABLE(1b,2b));
 }
 
 static inline int restore_fpu_checking(struct i387_fxsave_struct *fx)
@@ -57,10 +55,7 @@ static inline int restore_fpu_checking(struct i387_fxsave_struct *fx)
                      "3:  movl $-1,%[err]\n"
                      "    jmp  2b\n"
                      ".previous\n"
-                     ".section __ex_table,\"a\"\n"
-                     "   .align 8\n"
-                     "   .quad  1b,3b\n"
-                     ".previous"
+                     _ASM_EXTABLE(1b,3b)
                      : [err] "=r" (err)
 #if 0 /* See comment in __save_init_fpu() below. */
                      : [fx] "r" (fx), "m" (*fx), "0" (0));
@@ -99,10 +94,7 @@ static inline int save_i387_checking(struct i387_fxsave_struct __user *fx)
                      "3:  movl $-1,%[err]\n"
                      "    jmp  2b\n"
                      ".previous\n"
-                     ".section __ex_table,\"a\"\n"
-                     "   .align 8\n"
-                     "   .quad  1b,3b\n"
-                     ".previous"
+                     _ASM_EXTABLE(1b,3b)
                      : [err] "=r" (err), "=m" (*fx)
 #if 0 /* See comment in __fxsave_clear() below. */
                      : [fx] "r" (fx), "0" (0));