diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 16:53:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 16:53:42 -0800 |
| commit | a9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6 (patch) | |
| tree | f830b5218064a4902fe5650173c015bf3f1685eb /arch/sparc | |
| parent | 3feeba1e53f54f726a39da254a5c41e02530255e (diff) | |
| parent | 7a6046ebe28d6a5d259097dcb44162e5a6eca88e (diff) | |
| download | talos-obmc-linux-a9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6.tar.gz talos-obmc-linux-a9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6.zip | |
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.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms_64.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/sparc/kernel/sparc_ksyms_64.c b/arch/sparc/kernel/sparc_ksyms_64.c index da8f804feb49..0f26066a08d9 100644 --- a/arch/sparc/kernel/sparc_ksyms_64.c +++ b/arch/sparc/kernel/sparc_ksyms_64.c @@ -9,7 +9,6 @@ #include <linux/pci.h> #include <linux/init.h> -#include <asm/spinlock.h> #include <asm/system.h> #include <asm/cpudata.h> #include <asm/uaccess.h> @@ -23,16 +22,6 @@ struct poll { short revents; }; -/* used by various drivers */ -#ifdef CONFIG_SMP -/* Out of line rw-locking implementation. */ -EXPORT_SYMBOL(__read_lock); -EXPORT_SYMBOL(__read_unlock); -EXPORT_SYMBOL(__write_lock); -EXPORT_SYMBOL(__write_unlock); -EXPORT_SYMBOL(__write_trylock); -#endif /* CONFIG_SMP */ - /* from helpers.S */ EXPORT_SYMBOL(__flushw_user); EXPORT_SYMBOL_GPL(real_hard_smp_processor_id); |
