X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-parisc%2Fbitops.h;h=5badc617ec7cf2943f3307b209f25ee71ae4eca6;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=914f70ce0f752ffd2a932b10d5b21778e1f6e7e4;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/include/asm-parisc/bitops.h b/include/asm-parisc/bitops.h
index 914f70ce0..5badc617e 100644
--- a/include/asm-parisc/bitops.h
+++ b/include/asm-parisc/bitops.h
@@ -38,9 +38,9 @@ static __inline__ void set_bit(int nr, volatile unsigned long * address)
 
 	addr += (nr >> SHIFT_PER_LONG);
 	mask = 1L << CHOP_SHIFTCOUNT(nr);
-	atomic_spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+	_atomic_spin_lock_irqsave(addr, flags);
 	*addr |= mask;
-	atomic_spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+	_atomic_spin_unlock_irqrestore(addr, flags);
 }
 
 static __inline__ void __set_bit(int nr, volatile unsigned long * address)
@@ -61,9 +61,9 @@ static __inline__ void clear_bit(int nr, volatile unsigned long * address)
 
 	addr += (nr >> SHIFT_PER_LONG);
 	mask = 1L << CHOP_SHIFTCOUNT(nr);
-	atomic_spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+	_atomic_spin_lock_irqsave(addr, flags);
 	*addr &= ~mask;
-	atomic_spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+	_atomic_spin_unlock_irqrestore(addr, flags);
 }
 
 static __inline__ void __clear_bit(unsigned long nr, volatile unsigned long * address)
@@ -84,9 +84,9 @@ static __inline__ void change_bit(int nr, volatile unsigned long * address)
 
 	addr += (nr >> SHIFT_PER_LONG);
 	mask = 1L << CHOP_SHIFTCOUNT(nr);
-	atomic_spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+	_atomic_spin_lock_irqsave(addr, flags);
 	*addr ^= mask;
-	atomic_spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+	_atomic_spin_unlock_irqrestore(addr, flags);
 }
 
 static __inline__ void __change_bit(int nr, volatile unsigned long * address)
@@ -108,10 +108,10 @@ static __inline__ int test_and_set_bit(int nr, volatile unsigned long * address)
 
 	addr += (nr >> SHIFT_PER_LONG);
 	mask = 1L << CHOP_SHIFTCOUNT(nr);
-	atomic_spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+	_atomic_spin_lock_irqsave(addr, flags);
 	oldbit = (*addr & mask) ? 1 : 0;
 	*addr |= mask;
-	atomic_spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+	_atomic_spin_unlock_irqrestore(addr, flags);
 
 	return oldbit;
 }
@@ -139,10 +139,10 @@ static __inline__ int test_and_clear_bit(int nr, volatile unsigned long * addres
 
 	addr += (nr >> SHIFT_PER_LONG);
 	mask = 1L << CHOP_SHIFTCOUNT(nr);
-	atomic_spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+	_atomic_spin_lock_irqsave(addr, flags);
 	oldbit = (*addr & mask) ? 1 : 0;
 	*addr &= ~mask;
-	atomic_spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+	_atomic_spin_unlock_irqrestore(addr, flags);
 
 	return oldbit;
 }
@@ -170,10 +170,10 @@ static __inline__ int test_and_change_bit(int nr, volatile unsigned long * addre
 
 	addr += (nr >> SHIFT_PER_LONG);
 	mask = 1L << CHOP_SHIFTCOUNT(nr);
-	atomic_spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+	_atomic_spin_lock_irqsave(addr, flags);
 	oldbit = (*addr & mask) ? 1 : 0;
 	*addr ^= mask;
-	atomic_spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+	_atomic_spin_unlock_irqrestore(addr, flags);
 
 	return oldbit;
 }