Commit a9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6

Authored by Linus Torvalds

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix UP build failure.

Showing 1 changed file Side-by-side Diff

arch/sparc/kernel/sparc_ksyms_64.c
... ... @@ -9,7 +9,6 @@
9 9 #include <linux/pci.h>
10 10 #include <linux/init.h>
11 11  
12   -#include <asm/spinlock.h>
13 12 #include <asm/system.h>
14 13 #include <asm/cpudata.h>
15 14 #include <asm/uaccess.h>
... ... @@ -22,16 +21,6 @@
22 21 short events;
23 22 short revents;
24 23 };
25   -
26   -/* used by various drivers */
27   -#ifdef CONFIG_SMP
28   -/* Out of line rw-locking implementation. */
29   -EXPORT_SYMBOL(__read_lock);
30   -EXPORT_SYMBOL(__read_unlock);
31   -EXPORT_SYMBOL(__write_lock);
32   -EXPORT_SYMBOL(__write_unlock);
33   -EXPORT_SYMBOL(__write_trylock);
34   -#endif /* CONFIG_SMP */
35 24  
36 25 /* from helpers.S */
37 26 EXPORT_SYMBOL(__flushw_user);