Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / kernel / armksyms.c

diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index da69e660574bf1510f8f1457d07c7368b7de12e2..688b7b1ee416c54987239740680ffbd29fdeb3b0 100644 (file)
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -57,7 +57,7 @@ extern void fp_enter(void);
 #define EXPORT_SYMBOL_ALIAS(sym,orig)          \
  EXPORT_CRC_ALIAS(sym)                         \
  static const struct kernel_symbol __ksymtab_##sym     \
-  __attribute_used__ __attribute__((section("__ksymtab"))) =   \
+  __used __attribute__((section("__ksymtab"))) =       \
     { (unsigned long)&orig, #sym };
 
 /*
@@ -76,6 +76,7 @@ EXPORT_SYMBOL(__const_udelay);
 
        /* networking */
 EXPORT_SYMBOL(csum_partial);
+EXPORT_SYMBOL(csum_partial_copy_from_user);
 EXPORT_SYMBOL(csum_partial_copy_nocheck);
 EXPORT_SYMBOL(__csum_ipv6_magic);
 
@@ -179,8 +180,4 @@ EXPORT_SYMBOL(_find_first_bit_be);
 EXPORT_SYMBOL(_find_next_bit_be);
 #endif
 
-       /* syscalls */
-EXPORT_SYMBOL(sys_write);
-EXPORT_SYMBOL(sys_lseek);
-EXPORT_SYMBOL(sys_exit);
-EXPORT_SYMBOL(sys_wait4);
+EXPORT_SYMBOL(copy_page);