patch-2.1.36 linux/include/asm-sparc/smp_lock.h

• Lines: 47
• Date: Tue Apr 22 22:39:21 1997
• Orig file: v2.1.35/linux/include/asm-sparc/smp_lock.h
• Orig date: Mon Apr 14 16:28:21 1997

diff -u --recursive --new-file v2.1.35/linux/include/asm-sparc/smp_lock.h linux/include/asm-sparc/smp_lock.h
@@ -14,7 +14,7 @@
 #define lock_kernel()				do { } while(0)
 #define unlock_kernel()				do { } while(0)
 #define release_kernel_lock(task, cpu, depth)	((depth) = 1)
-#define reaquire_kernel_lock(task, cpu, depth)	do { } while(0)
+#define reacquire_kernel_lock(task, cpu, depth)	do { } while(0)
 
 #else
 
@@ -34,7 +34,7 @@
 } while(0)
 
 /* Do not fuck with this without consulting arch/sparc/lib/locks.S first! */
-#define reaquire_kernel_lock(task, cpu, depth)					\
+#define reacquire_kernel_lock(task, cpu, depth)					\
 do {										\
 	if(depth) {								\
 		register struct klock_info *klip asm("g1");			\
@@ -42,7 +42,7 @@
 		klip = &klock_info;						\
 		proc = cpu;							\
 		__asm__ __volatile__("mov	%%o7, %%g4\n\t"			\
-				     "call	___lock_reaquire_kernel\n\t"	\
+				     "call	___lock_reacquire_kernel\n\t"	\
 				     " mov	%2, %%g2"			\
 				     : /* No outputs. */			\
 				     : "r" (klip), "r" (proc), "r" (depth)	\
@@ -63,19 +63,6 @@
 	register int proc asm("g5");
 	klip = &klock_info;
 	proc = smp_processor_id();
-
-#if 1 /* Debugging */
-	if(local_irq_count[proc]) {
-		__label__ l1;
-l1:		printk("lock from interrupt context at %p\n", &&l1);
-	}
-	if(proc == global_irq_holder) {
-		__label__ l2;
-l2:		printk("Ugh at %p\n", &&l2);
-		sti();
-	}
-#endif
-
 	__asm__ __volatile__("
 	mov	%%o7, %%g4
 	call	___lock_kernel