diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/asm-generic | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/bitops.h | 8 | ||||
| -rw-r--r-- | include/asm-generic/pgtable.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h index 0ae108653..1428fd95b 100644 --- a/include/asm-generic/bitops.h +++ b/include/asm-generic/bitops.h @@ -9,14 +9,14 @@ * disable interrupts while they operate. (You have to provide inline * routines to cli() and sti().) * - * Also note, these routines assume that you have 32 bit integers. + * Also note, these routines assume that you have 32 bit longs. * You will have to change this if you are trying to port Linux to the * Alpha architecture or to a Cray. :-) * * C language equivalents written by Theodore Ts'o, 9/26/92 */ -extern __inline__ int set_bit(int nr,int * addr) +extern __inline__ int set_bit(int nr,long * addr) { int mask, retval; @@ -29,7 +29,7 @@ extern __inline__ int set_bit(int nr,int * addr) return retval; } -extern __inline__ int clear_bit(int nr, int * addr) +extern __inline__ int clear_bit(int nr, long * addr) { int mask, retval; @@ -42,7 +42,7 @@ extern __inline__ int clear_bit(int nr, int * addr) return retval; } -extern __inline__ int test_bit(int nr, int * addr) +extern __inline__ int test_bit(int nr, long * addr) { int mask; diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index a65546820..b98102522 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -26,7 +26,7 @@ static inline pte_t ptep_get_and_clear(pte_t *ptep) return pte; } -static inline void ptep_clear_wrprotect(pte_t *ptep) +static inline void ptep_set_wrprotect(pte_t *ptep) { pte_t old_pte = *ptep; set_pte(ptep, pte_wrprotect(old_pte)); |