lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sab: consolidate kmem_bufctl_t

Browse Source 
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>
This commit is contained in:
Kyle Moffett
2005-09-03 15:55:03 -07:00
committed by Linus Torvalds
parent 0e5c9f39f6
commit fa5b08d5f8
23 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-alpha/types.h
View File

@@ -56,8 +56,6 @@ typedef unsigned long u64;
typedef u64 dma_addr_t; typedef u64 dma_addr_t;
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ALPHA_TYPES_H */ #endif /* _ALPHA_TYPES_H */

2
include/asm-arm/types.h
View File

@@ -52,8 +52,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u32 dma64_addr_t; typedef u32 dma64_addr_t;
typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-arm26/types.h
View File

@@ -52,8 +52,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u32 dma64_addr_t; typedef u32 dma64_addr_t;
typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-cris/types.h
View File

@@ -52,8 +52,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u32 dma64_addr_t; typedef u32 dma64_addr_t;
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-frv/types.h
View File

@@ -65,8 +65,6 @@ typedef u64 u_quad_t;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-h8300/types.h
View File

@@ -58,8 +58,6 @@ typedef u32 dma_addr_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
typedef u64 sector_t; typedef u64 sector_t;
typedef unsigned int kmem_bufctl_t;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

2
include/asm-i386/types.h
View File

@@ -63,8 +63,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-ia64/types.h
View File

@@ -67,8 +67,6 @@ typedef __u64 u64;
typedef u64 dma_addr_t; typedef u64 dma_addr_t;
typedef unsigned short kmem_bufctl_t;
# endif /* __KERNEL__ */ # endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */

2
include/asm-m32r/types.h
View File

@@ -55,8 +55,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-m68k/types.h
View File

@@ -60,8 +60,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u32 dma64_addr_t; typedef u32 dma64_addr_t;
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-mips/types.h
View File

@@ -99,8 +99,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-parisc/types.h
View File

@@ -56,8 +56,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-ppc/types.h
View File

@@ -62,8 +62,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

1
include/asm-ppc64/types.h
View File

@@ -72,7 +72,6 @@ typedef struct {
unsigned long env; unsigned long env;
} func_descr_t; } func_descr_t;
typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-s390/types.h
View File

@@ -79,8 +79,6 @@ typedef unsigned long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef unsigned int kmem_bufctl_t;
#ifndef __s390x__ #ifndef __s390x__
typedef union { typedef union {
unsigned long long pair; unsigned long long pair;

2
include/asm-sh/types.h
View File

@@ -58,8 +58,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-sh64/types.h
View File

@@ -65,8 +65,6 @@ typedef u32 dma_addr_t;
#endif #endif
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
typedef unsigned int kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define BITS_PER_LONG 32 #define BITS_PER_LONG 32

2
include/asm-sparc/types.h
View File

@@ -54,8 +54,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u32 dma64_addr_t; typedef u32 dma64_addr_t;
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-sparc64/types.h
View File

@@ -56,8 +56,6 @@ typedef unsigned long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-v850/types.h
View File

@@ -59,8 +59,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef unsigned int kmem_bufctl_t;
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-x86_64/types.h
View File

@@ -51,8 +51,6 @@ typedef u64 dma_addr_t;
typedef u64 sector_t; typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
typedef unsigned short kmem_bufctl_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
include/asm-xtensa/types.h
View File

@@ -58,8 +58,6 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef unsigned int kmem_bufctl_t;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif

1
mm/slab.c
View File

@@ -189,6 +189,7 @@
* is less than 512 (PAGE_SIZE<<3), but greater than 256. * 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_END (((kmem_bufctl_t)(~0U))-0)
#define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1) #define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1)
#define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2) #define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2)