diff -ur linux-2.5.27-clean/include/linux/spinlock.h linux-2.5.27/include/linux/spinlock.h
--- linux-2.5.27-clean/include/linux/spinlock.h	Tue Jul 23 09:19:51 2002
+++ linux-2.5.27/include/linux/spinlock.h	Tue Jul 23 09:26:16 2002
@@ -150,6 +150,14 @@
 		preempt_schedule(); \
 } while (0)
 
+#else /* !CONFIG_PREEMPT */
+#define preempt_get_count()		(0)
+#define preempt_disable()		do { } while(0)
+#define preempt_enable_no_resched()	do { } while(0)
+#define preempt_enable()		do { } while(0)
+#define preempt_check_resched()		do { } while(0)
+#endif /* !CONFIG_PREEMPT */
+
 #define spin_lock(lock)	\
 do { \
 	preempt_disable(); \
@@ -176,26 +184,6 @@
 #define write_unlock(lock)	({_raw_write_unlock(lock); preempt_enable();})
 #define write_trylock(lock)	({preempt_disable();_raw_write_trylock(lock) ? \
 				1 : ({preempt_enable(); 0;});})
-
-#else
-
-#define preempt_get_count()		(0)
-#define preempt_disable()		do { } while (0)
-#define preempt_enable_no_resched()	do {} while(0)
-#define preempt_enable()		do { } while (0)
-#define preempt_check_resched()		do { } while (0)
-
-#define spin_lock(lock)			_raw_spin_lock(lock)
-#define spin_trylock(lock)		_raw_spin_trylock(lock)
-#define spin_unlock(lock)		_raw_spin_unlock(lock)
-#define spin_unlock_no_resched(lock)	_raw_spin_unlock(lock)
-
-#define read_lock(lock)			_raw_read_lock(lock)
-#define read_unlock(lock)		_raw_read_unlock(lock)
-#define write_lock(lock)		_raw_write_lock(lock)
-#define write_unlock(lock)		_raw_write_unlock(lock)
-#define write_trylock(lock)		_raw_write_trylock(lock)
-#endif
 
 /* "lock on reference count zero" */
 #ifndef ATOMIC_DEC_AND_LOCK
Only in linux-2.5.27-clean/include/linux: spinlock.h.orig