collision: arch/sparc/include/asm/spinlock_64.h vs. include/linux/spinlock_up.h

Message ID
State Accepted
Delegated to: David Miller
Headers show

Commit Message

David Miller Jan. 14, 2009, 1:33 a.m.
From: Alexander Beregalov <>
Date: Tue, 13 Jan 2009 13:06:26 +0300

> __raw_{read,write}*() are defined in both places.

The best part is that we don't need to export any of
these rwlock symbols from sparc_ksyms_64.c

All of those routines are inline functions.

Thanks for the report, both of you, I'll fix it like

To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to
More majordomo info at


diff --git a/arch/sparc/kernel/sparc_ksyms_64.c b/arch/sparc/kernel/sparc_ksyms_64.c
index da8f804..0f26066 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. */
-#endif /* CONFIG_SMP */
 /* from helpers.S */