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.
This commit is contained in:
Linus Torvalds 2009-01-15 16:53:42 -08:00
commit a9f8d25b65

View File

@ -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);