diff -urNp 2.4.20/drivers/char/ser_a2232.c smp/drivers/char/ser_a2232.c
--- 2.4.20/drivers/char/ser_a2232.c	2002-01-22 18:53:29.000000000 +0100
+++ smp/drivers/char/ser_a2232.c	2002-12-03 03:10:12.000000000 +0100
@@ -776,7 +776,7 @@ int a2232board_init(void)
 	volatile u_char *to;
 	volatile struct a2232memory *mem;
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	return -ENODEV;	/* This driver is not SMP aware. Is there an SMP ZorroII-bus-machine? */
 #endif
 
diff -urNp 2.4.20/drivers/message/fusion/linux_compat.h smp/drivers/message/fusion/linux_compat.h
--- 2.4.20/drivers/message/fusion/linux_compat.h	2002-11-29 02:23:05.000000000 +0100
+++ smp/drivers/message/fusion/linux_compat.h	2002-12-03 03:10:12.000000000 +0100
@@ -93,7 +93,7 @@ typedef void (*__cleanup_module_func_t)(
  * Used prior to schedule_timeout calls..
  */
 #define __set_current_state(state_value)	do { current->state = state_value; } while (0)
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 #define set_current_state(state_value)		do { __set_current_state(state_value); mb(); } while (0)
 #else
 #define set_current_state(state_value)		__set_current_state(state_value)
diff -urNp 2.4.20/drivers/net/wan/sdla_chdlc.c smp/drivers/net/wan/sdla_chdlc.c
--- 2.4.20/drivers/net/wan/sdla_chdlc.c	2002-11-29 02:23:06.000000000 +0100
+++ smp/drivers/net/wan/sdla_chdlc.c	2002-12-03 03:10:12.000000000 +0100
@@ -3822,7 +3822,7 @@ static void chdlc_poll_delay (unsigned l
 
 void s508_lock (sdla_t *card, unsigned long *smp_flags)
 {
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 	spin_lock_irqsave(&card->wandev.lock, *smp_flags);
         if (card->next){
         	spin_lock(&card->next->wandev.lock);
@@ -3834,7 +3834,7 @@ void s508_lock (sdla_t *card, unsigned l
 
 void s508_unlock (sdla_t *card, unsigned long *smp_flags)
 {
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
         if (card->next){
         	spin_unlock(&card->next->wandev.lock);
         }
diff -urNp 2.4.20/drivers/net/wan/sdla_fr.c smp/drivers/net/wan/sdla_fr.c
--- 2.4.20/drivers/net/wan/sdla_fr.c	2002-08-09 14:52:17.000000000 +0200
+++ smp/drivers/net/wan/sdla_fr.c	2002-12-03 03:10:12.000000000 +0100
@@ -4709,13 +4709,13 @@ void s508_s514_lock(sdla_t *card, unsign
 {
 	if (card->hw.type != SDLA_S514){
 
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 		spin_lock_irqsave(&card->wandev.lock, *smp_flags);
 #else
           	disable_irq(card->hw.irq);
 #endif
 	}else{
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 		spin_lock(&card->u.f.if_send_lock);
 #endif
 	}
@@ -4727,13 +4727,13 @@ void s508_s514_unlock(sdla_t *card, unsi
 {
 	if (card->hw.type != SDLA_S514){
 
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 		spin_unlock_irqrestore (&card->wandev.lock, *smp_flags);
 #else
           	enable_irq(card->hw.irq);
 #endif
 	}else{
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 		spin_unlock(&card->u.f.if_send_lock);
 #endif
 	}
diff -urNp 2.4.20/drivers/net/wan/sdla_ppp.c smp/drivers/net/wan/sdla_ppp.c
--- 2.4.20/drivers/net/wan/sdla_ppp.c	2002-08-09 14:52:17.000000000 +0200
+++ smp/drivers/net/wan/sdla_ppp.c	2002-12-03 03:10:12.000000000 +0100
@@ -3331,7 +3331,7 @@ static int chk_bcast_mcast_addr(sdla_t *
 
 void s508_lock (sdla_t *card, unsigned long *smp_flags)
 {
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 	spin_lock_irqsave(&card->wandev.lock, *smp_flags);
 #else
 	disable_irq(card->hw.irq);
@@ -3340,7 +3340,7 @@ void s508_lock (sdla_t *card, unsigned l
 
 void s508_unlock (sdla_t *card, unsigned long *smp_flags)
 {
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
         spin_unlock_irqrestore(&card->wandev.lock, *smp_flags);
 #else
 	enable_irq(card->hw.irq);
diff -urNp 2.4.20/drivers/net/wan/sdlamain.c smp/drivers/net/wan/sdlamain.c
--- 2.4.20/drivers/net/wan/sdlamain.c	2002-11-29 02:23:06.000000000 +0100
+++ smp/drivers/net/wan/sdlamain.c	2002-12-03 03:10:12.000000000 +0100
@@ -511,7 +511,7 @@ static int setup (wan_device_t* wandev, 
 	if (!card->configured){
 
 		/* Initialize the Spin lock */
-#if defined(__SMP__) || defined(LINUX_2_4) 
+#if defined(CONFIG_SMP) || defined(LINUX_2_4) 
 		printk(KERN_INFO "%s: Initializing for SMP\n",wandev->name);
 #endif
 
diff -urNp 2.4.20/drivers/net/wan/wanpipe_multppp.c smp/drivers/net/wan/wanpipe_multppp.c
--- 2.4.20/drivers/net/wan/wanpipe_multppp.c	2002-01-22 18:53:48.000000000 +0100
+++ smp/drivers/net/wan/wanpipe_multppp.c	2002-12-03 03:10:12.000000000 +0100
@@ -2358,7 +2358,7 @@ static void port_set_state (sdla_t *card
 
 void s508_lock (sdla_t *card, unsigned long *smp_flags)
 {
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 	spin_lock_irqsave(&card->wandev.lock, *smp_flags);
         if (card->next){
 		/* It is ok to use spin_lock here, since we
@@ -2372,7 +2372,7 @@ void s508_lock (sdla_t *card, unsigned l
 
 void s508_unlock (sdla_t *card, unsigned long *smp_flags)
 {
-#if defined(__SMP__) || defined(LINUX_2_4)
+#if defined(CONFIG_SMP) || defined(LINUX_2_4)
 	if (card->next){
 		spin_unlock(&card->next->wandev.lock);
 	}
diff -urNp 2.4.20/drivers/s390/net/ctctty.c smp/drivers/s390/net/ctctty.c
--- 2.4.20/drivers/s390/net/ctctty.c	2002-08-09 14:52:17.000000000 +0200
+++ smp/drivers/s390/net/ctctty.c	2002-12-03 03:10:12.000000000 +0100
@@ -42,7 +42,7 @@ typedef struct wait_queue *wait_queue_he
 #define init_waitqueue_head(x) *(x)=NULL
 #define __set_current_state(state_value) \
 	do { current->state = state_value; } while (0)
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 #define set_current_state(state_value) \
 	do { __set_current_state(state_value); mb(); } while (0)
 #else
diff -urNp 2.4.20/drivers/scsi/3w-xxxx.c smp/drivers/scsi/3w-xxxx.c
--- 2.4.20/drivers/scsi/3w-xxxx.c	2002-11-29 02:23:07.000000000 +0100
+++ smp/drivers/scsi/3w-xxxx.c	2002-12-03 03:10:12.000000000 +0100
@@ -165,7 +165,7 @@
 #include <linux/module.h>
 
 MODULE_AUTHOR ("3ware Inc.");
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 MODULE_DESCRIPTION ("3ware Storage Controller Linux Driver (SMP)");
 #else
 MODULE_DESCRIPTION ("3ware Storage Controller Linux Driver");
diff -urNp 2.4.20/fs/jbd/transaction.c smp/fs/jbd/transaction.c
--- 2.4.20/fs/jbd/transaction.c	2002-11-29 02:23:15.000000000 +0100
+++ smp/fs/jbd/transaction.c	2002-12-03 03:10:15.000000000 +0100
@@ -1547,9 +1547,6 @@ void __journal_unfile_buffer(struct jour
 	assert_spin_locked(&journal_datalist_lock);
 	transaction = jh->b_transaction;
 
-#ifdef __SMP__
-	J_ASSERT (current->lock_depth >= 0);
-#endif
 	J_ASSERT_JH(jh, jh->b_jlist < BJ_Types);
 
 	if (jh->b_jlist != BJ_None)
@@ -1962,9 +1959,6 @@ void __journal_file_buffer(struct journa
 
 	assert_spin_locked(&journal_datalist_lock);
 	
-#ifdef __SMP__
-	J_ASSERT (current->lock_depth >= 0);
-#endif
 	J_ASSERT_JH(jh, jh->b_jlist < BJ_Types);
 	J_ASSERT_JH(jh, jh->b_transaction == transaction ||
 				jh->b_transaction == 0);
@@ -2047,9 +2041,6 @@ void __journal_refile_buffer(struct jour
 	int was_dirty = 0;
 
 	assert_spin_locked(&journal_datalist_lock);
-#ifdef __SMP__
-	J_ASSERT_JH(jh, current->lock_depth >= 0);
-#endif
 	/* If the buffer is now unused, just drop it. */
 	if (jh->b_next_transaction == NULL) {
 		__journal_unfile_buffer(jh);