---
 include/linux/ipipe.h |   43 -------------------------------------------
 lib/spinlock_debug.c  |   18 ------------------
 2 files changed, 61 deletions(-)

Index: linux-2.6.19-ipipe/include/linux/ipipe.h
===================================================================
--- linux-2.6.19-ipipe.orig/include/linux/ipipe.h
+++ linux-2.6.19-ipipe/include/linux/ipipe.h
@@ -229,49 +229,6 @@ do { \
 	} \
 } while(0)
 
-#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-#define write_lock_hw(x)		__raw_write_lock(&(x)->raw_lock)
-#define write_trylock_hw(x)		__raw_write_trylock(&(x)->raw_lock)
-#define write_unlock_hw(x)		__raw_write_unlock(&(x)->raw_lock)
-#define read_lock_hw(x)		__raw_read_lock(&(x)->raw_lock)
-#define read_trylock_hw(x)		__raw_read_trylock(&(x)->raw_lock)
-#define read_unlock_hw(x)		__raw_read_unlock(&(x)->raw_lock)
-#else /* UP non-debug */
-#define write_lock_hw(lock)		do { (void)(lock); } while (0)
-#define write_trylock_hw(lock)	({ (void)(lock); 1; })
-#define write_unlock_hw(lock)		do { (void)(lock); } while (0)
-#define read_lock_hw(lock)		do { (void)(lock); } while (0)
-#define read_trylock_hw(lock)		({ (void)(lock); 1; })
-#define read_unlock_hw(lock)		do { (void)(lock); } while (0)
-#endif /* CONFIG_SMP || CONFIG_DEBUG_SPINLOCK */
-
-typedef rwlock_t			ipipe_rwlock_t;
-#define IPIPE_RW_LOCK_UNLOCKED		RW_LOCK_UNLOCKED
-
-#define read_lock_irqsave_hw(lock, flags)	\
-do {						\
-	local_irq_save_hw(flags);		\
-	read_lock_hw(lock);			\
-} while (0)
-
-#define read_unlock_irqrestore_hw(lock, flags)	\
-do {						\
-	read_unlock_hw(lock);			\
-	local_irq_restore_hw(flags);		\
-} while (0)
-
-#define write_lock_irqsave_hw(lock, flags)	\
-do {						\
-	local_irq_save_hw(flags);		\
-	write_lock_hw(lock);			\
-} while (0)
-
-#define write_unlock_irqrestore_hw(lock, flags)	\
-do {						\
-	write_unlock_hw(lock);			\
-	local_irq_restore_hw(flags);		\
-} while (0)
-
 DECLARE_PER_CPU(struct ipipe_domain *, ipipe_percpu_domain);
 
 extern struct ipipe_domain ipipe_root;
Index: linux-2.6.19-ipipe/lib/spinlock_debug.c
===================================================================
--- linux-2.6.19-ipipe.orig/lib/spinlock_debug.c
+++ linux-2.6.19-ipipe/lib/spinlock_debug.c
@@ -129,8 +129,6 @@ void _raw_spin_lock(spinlock_t *lock)
 	debug_spin_lock_after(lock);
 }
 
-EXPORT_SYMBOL(_raw_spin_lock);
-
 int _raw_spin_trylock(spinlock_t *lock)
 {
 	int ret = __raw_spin_trylock(&lock->raw_lock);
@@ -146,16 +144,12 @@ int _raw_spin_trylock(spinlock_t *lock)
 	return ret;
 }
 
-EXPORT_SYMBOL(_raw_spin_trylock);
-
 void _raw_spin_unlock(spinlock_t *lock)
 {
 	debug_spin_unlock(lock);
 	__raw_spin_unlock(&lock->raw_lock);
 }
 
-EXPORT_SYMBOL(_raw_spin_unlock);
-
 static void rwlock_bug(rwlock_t *lock, const char *msg)
 {
 	if (!debug_locks_off())
@@ -201,8 +195,6 @@ void _raw_read_lock(rwlock_t *lock)
 	__raw_read_lock(&lock->raw_lock);
 }
 
-EXPORT_SYMBOL(_raw_read_lock);
-
 int _raw_read_trylock(rwlock_t *lock)
 {
 	int ret = __raw_read_trylock(&lock->raw_lock);
@@ -216,16 +208,12 @@ int _raw_read_trylock(rwlock_t *lock)
 	return ret;
 }
 
-EXPORT_SYMBOL(_raw_read_trylock);
-
 void _raw_read_unlock(rwlock_t *lock)
 {
 	RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
 	__raw_read_unlock(&lock->raw_lock);
 }
 
-EXPORT_SYMBOL(_raw_read_unlock);
-
 static inline void debug_write_lock_before(rwlock_t *lock)
 {
 	RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
@@ -283,8 +271,6 @@ void _raw_write_lock(rwlock_t *lock)
 	debug_write_lock_after(lock);
 }
 
-EXPORT_SYMBOL(_raw_write_lock);
-
 int _raw_write_trylock(rwlock_t *lock)
 {
 	int ret = __raw_write_trylock(&lock->raw_lock);
@@ -300,12 +286,8 @@ int _raw_write_trylock(rwlock_t *lock)
 	return ret;
 }
 
-EXPORT_SYMBOL(_raw_write_trylock);
-
 void _raw_write_unlock(rwlock_t *lock)
 {
 	debug_write_unlock(lock);
 	__raw_write_unlock(&lock->raw_lock);
 }
-
-EXPORT_SYMBOL(_raw_write_unlock);