Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Apr 2008 18:00:05 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Apr 2008 18:00:05 +0000 (11:00 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
  sh: export empty_zero_page
  sh: arch/sh/kernel/traps_32.c needs asm/fpu.h
  sh: fix compressed kernel build
  sh64: add missing #include <asm/fpu.h>'s

arch/sh/boot/compressed/head_32.S
arch/sh/boot/compressed/head_64.S
arch/sh/kernel/process_64.c
arch/sh/kernel/ptrace_64.c
arch/sh/kernel/sh_ksyms_32.c
arch/sh/kernel/sh_ksyms_64.c
arch/sh/kernel/signal_64.c
arch/sh/kernel/traps_32.c
arch/sh/kernel/traps_64.c

index a8399b013729faa4bc10081518018ee86f1d813d..06ac31f3be88647af51a3f1011a145b57b6ce2a5 100644 (file)
@@ -7,7 +7,6 @@
 
 .text
 
-#include <linux/linkage.h>
 #include <asm/page.h>
 
        .global startup
index 1d4ecbfc767c484234a3ffe697b822969e775372..f72c1989f5f2f5934e7940490560a2eeac04bb0a 100644 (file)
@@ -13,7 +13,6 @@
  * Modification for compressed loader:
  *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)
  */
-#include <linux/linkage.h>
 #include <asm/cache.h>
 #include <asm/cpu/mmu_context.h>
 #include <asm/cpu/registers.h>
index 046999b1d1af11da3069748843e9d4d4257a2f74..0283d8133075b0507d04d5ca5417a3a6c1425017 100644 (file)
@@ -28,6 +28,7 @@
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/mmu_context.h>
+#include <asm/fpu.h>
 
 struct task_struct *last_task_used_math = NULL;
 
index f6fbdfa6876d0a7463c748b31a8fb591b926c4a2..d453c47dc522176a75821903084b566ae7105dfc 100644 (file)
@@ -33,6 +33,7 @@
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/mmu_context.h>
+#include <asm/fpu.h>
 
 /* This mask defines the bits of the SR which the user is not allowed to
    change, which are everything except S, Q, M, PR, SZ, FR. */
index d80de39032710d094fdb73147eff86466a558ef2..45bb333fd9eccc16fa68d64944d458c766955fee 100644 (file)
@@ -149,3 +149,4 @@ EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(__clear_user);
 EXPORT_SYMBOL(_ebss);
+EXPORT_SYMBOL(empty_zero_page);
index dd38a683de65633d38176de60384dcb3432b5b77..b6410ce4bd1dfcfd6924b0fbbaa5ecef4013ea0e 100644 (file)
@@ -44,6 +44,7 @@ EXPORT_SYMBOL(__put_user_asm_l);
 EXPORT_SYMBOL(__get_user_asm_l);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(__copy_user);
+EXPORT_SYMBOL(empty_zero_page);
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(__udelay);
 EXPORT_SYMBOL(__ndelay);
index 80bde19d445be5bc2f2628b75502915e6990cc23..552eb810cd85e6c9199b5558d567f292eacbad20 100644 (file)
@@ -26,6 +26,7 @@
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
+#include <asm/fpu.h>
 
 #define REG_RET 9
 #define REG_ARG1 2
index baa4fa368dce2e14f164819cd396f5cf352c1c63..e08b3bfeb6566fc430e5a50c0ed93cde07eedf3c 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/limits.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
+#include <asm/fpu.h>
 
 #ifdef CONFIG_SH_KGDB
 #include <asm/kgdb.h>
index 1b58a749908739d4a3224ee5eb7eef33bc51c565..a85831cbf18ba6524968f8c3e7dfa6a1bc6025d9 100644 (file)
@@ -30,6 +30,7 @@
 #include <asm/atomic.h>
 #include <asm/processor.h>
 #include <asm/pgtable.h>
+#include <asm/fpu.h>
 
 #undef DEBUG_EXCEPTION
 #ifdef DEBUG_EXCEPTION