patch-2.4.0-test2 linux/arch/arm/lib/clearbit.S

• Lines: 26
• Date: Mon Jun 19 17:59:34 2000
• Orig file: v2.4.0-test1/linux/arch/arm/lib/clearbit.S
• Orig date: Fri Jan 21 18:19:16 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/arm/lib/clearbit.S linux/arch/arm/lib/clearbit.S
@@ -8,19 +8,20 @@
 #include <asm/assembler.h>
                 .text
 
-@ Purpose  : Function to clear a bit
-@ Prototype: int clear_bit(int bit,int *addr)
+/*
+ * Purpose  : Function to clear a bit
+ * Prototype: int clear_bit(int bit, void *addr)
+ */
 
 ENTRY(clear_bit)
 		and	r2, r0, #7
 		mov	r3, #1
 		mov	r3, r3, lsl r2
-		SAVEIRQS(ip)
-		DISABLEIRQS(ip)
+		save_and_disable_irqs ip, r2
 		ldrb	r2, [r1, r0, lsr #3]
 		bic	r2, r2, r3
 		strb	r2, [r1, r0, lsr #3]
-		RESTOREIRQS(ip)
+		restore_irqs ip
 		RETINSTR(mov,pc,lr)