patch-2.3.40 linux/drivers/net/tulip.c

Next file: linux/drivers/net/wan/syncppp.c
Previous file: linux/drivers/net/tokenring/tms380tr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.39/linux/drivers/net/tulip.c linux/drivers/net/tulip.c
@@ -102,7 +102,6 @@
 #endif
 
 #if (LINUX_VERSION_CODE < 0x20123)
-#define hard_smp_processor_id() smp_processor_id()
 #define test_and_set_bit(val, addr) set_bit(val, addr)
 #endif
 
@@ -2164,7 +2163,7 @@
 #ifdef SMP_CHECK
 		printk(KERN_ERR "%s: Re-entering the interrupt handler with proc %d,"
 			   " proc %d already handling.\n", dev->name,
-			   tp->smp_proc_id, hard_smp_processor_id());
+			   tp->smp_proc_id, smp_processor_id());
 #else
 		printk(KERN_ERR "%s: Re-entering the interrupt handler.\n", dev->name);
 #endif
@@ -2172,7 +2171,7 @@
 	}
 	dev->interrupt = 1;
 #ifdef SMP_CHECK
-	tp->smp_proc_id = hard_smp_processor_id();
+	tp->smp_proc_id = smp_processor_id();
 #endif
 
 	do {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)