diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
tree | 8224d013ff5d255420713d05610c7efebd204d2a /include/asm-mips/bitops.h | |
parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'include/asm-mips/bitops.h')
-rw-r--r-- | include/asm-mips/bitops.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index a059bb178..89668887e 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h @@ -5,11 +5,14 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (c) 1994, 1995, 1996 Ralf Baechle + * Copyright (c) 1994 - 1997 Ralf Baechle (ralf@gnu.org) */ #ifndef __ASM_MIPS_BITOPS_H #define __ASM_MIPS_BITOPS_H +#include <linux/types.h> +#include <linux/byteorder/swab.h> /* sigh ... */ + #ifdef __KERNEL__ #include <asm/sgidefs.h> @@ -467,11 +470,6 @@ extern __inline__ int ext2_test_bit(int nr, const void * addr) #define ext2_find_first_zero_bit(addr, size) \ ext2_find_next_zero_bit((addr), (size), 0) -static __inline__ unsigned long __swab32(unsigned long val) -{ - return ((val>>24)|((val>>8)&0xff00)|((val<<8)&0xff0000)|(val<<24)); -} - extern __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset) { unsigned long *p = ((unsigned long *) addr) + (offset >> 5); |