Skip to content

Commit

Permalink
[PATCH] sab: consolidate kmem_bufctl_t
Browse files Browse the repository at this point in the history 
This is used only in slab.c and each architecture gets to define whcih
underlying type is to be used.

Seems a bit silly - move it to slab.c and use the same type for all
architectures: unsigned int.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Kyle Moffett authored and Linus Torvalds committed Sep 5, 2005
1 parent 0e5c9f3 commit fa5b08d
Show file tree
Hide file tree
Showing 23 changed files with 1 addition and 43 deletions.
2 changes: 0 additions & 2 deletions include/asm-alpha/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ typedef unsigned long u64;
typedef u64 dma_addr_t;
typedef u64 dma64_addr_t;

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ALPHA_TYPES_H */
2 changes: 0 additions & 2 deletions include/asm-arm/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u32 dma64_addr_t;

typedef unsigned int kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-arm26/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u32 dma64_addr_t;

typedef unsigned int kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-cris/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u32 dma64_addr_t;

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-frv/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ typedef u64 u_quad_t;

typedef u32 dma_addr_t;

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-h8300/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ typedef u32 dma_addr_t;
#define HAVE_SECTOR_T
typedef u64 sector_t;

typedef unsigned int kmem_bufctl_t;

#endif /* __KERNEL__ */

#endif /* __ASSEMBLY__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-i386/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T
#endif

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-ia64/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ typedef __u64 u64;

typedef u64 dma_addr_t;

typedef unsigned short kmem_bufctl_t;

# endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */

Expand Down
2 changes: 0 additions & 2 deletions include/asm-m32r/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u64 dma64_addr_t;

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-m68k/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u32 dma64_addr_t;

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-mips/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T
#endif

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-parisc/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u64 dma64_addr_t;

typedef unsigned int kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-ppc/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T
#endif

typedef unsigned int kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
1 change: 0 additions & 1 deletion include/asm-ppc64/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ typedef struct {
unsigned long env;
} func_descr_t;

typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-s390/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ typedef unsigned long u64;

typedef u32 dma_addr_t;

typedef unsigned int kmem_bufctl_t;

#ifndef __s390x__
typedef union {
unsigned long long pair;
Expand Down
2 changes: 0 additions & 2 deletions include/asm-sh/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T
#endif

typedef unsigned int kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-sh64/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ typedef u32 dma_addr_t;
#endif
typedef u64 dma64_addr_t;

typedef unsigned int kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#define BITS_PER_LONG 32
Expand Down
2 changes: 0 additions & 2 deletions include/asm-sparc/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u32 dma64_addr_t;

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-sparc64/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ typedef unsigned long u64;
typedef u32 dma_addr_t;
typedef u64 dma64_addr_t;

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-v850/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ typedef unsigned long long u64;

typedef u32 dma_addr_t;

typedef unsigned int kmem_bufctl_t;

#endif /* !__ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-x86_64/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ typedef u64 dma_addr_t;
typedef u64 sector_t;
#define HAVE_SECTOR_T

typedef unsigned short kmem_bufctl_t;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */
Expand Down
2 changes: 0 additions & 2 deletions include/asm-xtensa/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ typedef unsigned long long u64;

typedef u32 dma_addr_t;

typedef unsigned int kmem_bufctl_t;

#endif /* __KERNEL__ */
#endif

Expand Down
1 change: 1 addition & 0 deletions mm/slab.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
* is less than 512 (PAGE_SIZE<<3), but greater than 256.
*/

typedef unsigned int kmem_bufctl_t;
#define BUFCTL_END (((kmem_bufctl_t)(~0U))-0)
#define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1)
#define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2)
Expand Down

0 comments on commit fa5b08d

Please sign in to comment.