tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] sab: consolidate kmem_bufctl_t

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>

authored by

Kyle Moffett and committed by
Linus Torvalds fa5b08d5 0e5c9f39

+1 -43
-2
include/asm-alpha/types.h
··· 56 56 typedef u64 dma_addr_t; 57 57 typedef u64 dma64_addr_t; 58 58 59 - typedef unsigned short kmem_bufctl_t; 60 - 61 59 #endif /* __ASSEMBLY__ */ 62 60 #endif /* __KERNEL__ */ 63 61 #endif /* _ALPHA_TYPES_H */
-2
include/asm-arm/types.h
··· 52 52 typedef u32 dma_addr_t; 53 53 typedef u32 dma64_addr_t; 54 54 55 - typedef unsigned int kmem_bufctl_t; 56 - 57 55 #endif /* __ASSEMBLY__ */ 58 56 59 57 #endif /* __KERNEL__ */
-2
include/asm-arm26/types.h
··· 52 52 typedef u32 dma_addr_t; 53 53 typedef u32 dma64_addr_t; 54 54 55 - typedef unsigned int kmem_bufctl_t; 56 - 57 55 #endif /* __ASSEMBLY__ */ 58 56 59 57 #endif /* __KERNEL__ */
-2
include/asm-cris/types.h
··· 52 52 typedef u32 dma_addr_t; 53 53 typedef u32 dma64_addr_t; 54 54 55 - typedef unsigned short kmem_bufctl_t; 56 - 57 55 #endif /* __ASSEMBLY__ */ 58 56 59 57 #endif /* __KERNEL__ */
-2
include/asm-frv/types.h
··· 65 65 66 66 typedef u32 dma_addr_t; 67 67 68 - typedef unsigned short kmem_bufctl_t; 69 - 70 68 #endif /* __ASSEMBLY__ */ 71 69 72 70 #endif /* __KERNEL__ */
-2
include/asm-h8300/types.h
··· 58 58 #define HAVE_SECTOR_T 59 59 typedef u64 sector_t; 60 60 61 - typedef unsigned int kmem_bufctl_t; 62 - 63 61 #endif /* __KERNEL__ */ 64 62 65 63 #endif /* __ASSEMBLY__ */
-2
include/asm-i386/types.h
··· 63 63 #define HAVE_SECTOR_T 64 64 #endif 65 65 66 - typedef unsigned short kmem_bufctl_t; 67 - 68 66 #endif /* __ASSEMBLY__ */ 69 67 70 68 #endif /* __KERNEL__ */
-2
include/asm-ia64/types.h
··· 67 67 68 68 typedef u64 dma_addr_t; 69 69 70 - typedef unsigned short kmem_bufctl_t; 71 - 72 70 # endif /* __KERNEL__ */ 73 71 #endif /* !__ASSEMBLY__ */ 74 72
-2
include/asm-m32r/types.h
··· 55 55 typedef u32 dma_addr_t; 56 56 typedef u64 dma64_addr_t; 57 57 58 - typedef unsigned short kmem_bufctl_t; 59 - 60 58 #endif /* __ASSEMBLY__ */ 61 59 62 60 #endif /* __KERNEL__ */
-2
include/asm-m68k/types.h
··· 60 60 typedef u32 dma_addr_t; 61 61 typedef u32 dma64_addr_t; 62 62 63 - typedef unsigned short kmem_bufctl_t; 64 - 65 63 #endif /* __ASSEMBLY__ */ 66 64 67 65 #endif /* __KERNEL__ */
-2
include/asm-mips/types.h
··· 99 99 #define HAVE_SECTOR_T 100 100 #endif 101 101 102 - typedef unsigned short kmem_bufctl_t; 103 - 104 102 #endif /* __ASSEMBLY__ */ 105 103 106 104 #endif /* __KERNEL__ */
-2
include/asm-parisc/types.h
··· 56 56 typedef u32 dma_addr_t; 57 57 typedef u64 dma64_addr_t; 58 58 59 - typedef unsigned int kmem_bufctl_t; 60 - 61 59 #endif /* __ASSEMBLY__ */ 62 60 63 61 #endif /* __KERNEL__ */
-2
include/asm-ppc/types.h
··· 62 62 #define HAVE_SECTOR_T 63 63 #endif 64 64 65 - typedef unsigned int kmem_bufctl_t; 66 - 67 65 #endif /* __ASSEMBLY__ */ 68 66 69 67 #endif /* __KERNEL__ */
-1
include/asm-ppc64/types.h
··· 72 72 unsigned long env; 73 73 } func_descr_t; 74 74 75 - typedef unsigned int kmem_bufctl_t; 76 75 #endif /* __ASSEMBLY__ */ 77 76 78 77 #endif /* __KERNEL__ */
-2
include/asm-s390/types.h
··· 79 79 80 80 typedef u32 dma_addr_t; 81 81 82 - typedef unsigned int kmem_bufctl_t; 83 - 84 82 #ifndef __s390x__ 85 83 typedef union { 86 84 unsigned long long pair;
-2
include/asm-sh/types.h
··· 58 58 #define HAVE_SECTOR_T 59 59 #endif 60 60 61 - typedef unsigned int kmem_bufctl_t; 62 - 63 61 #endif /* __ASSEMBLY__ */ 64 62 65 63 #endif /* __KERNEL__ */
-2
include/asm-sh64/types.h
··· 65 65 #endif 66 66 typedef u64 dma64_addr_t; 67 67 68 - typedef unsigned int kmem_bufctl_t; 69 - 70 68 #endif /* __ASSEMBLY__ */ 71 69 72 70 #define BITS_PER_LONG 32
-2
include/asm-sparc/types.h
··· 54 54 typedef u32 dma_addr_t; 55 55 typedef u32 dma64_addr_t; 56 56 57 - typedef unsigned short kmem_bufctl_t; 58 - 59 57 #endif /* __ASSEMBLY__ */ 60 58 61 59 #endif /* __KERNEL__ */
-2
include/asm-sparc64/types.h
··· 56 56 typedef u32 dma_addr_t; 57 57 typedef u64 dma64_addr_t; 58 58 59 - typedef unsigned short kmem_bufctl_t; 60 - 61 59 #endif /* __ASSEMBLY__ */ 62 60 63 61 #endif /* __KERNEL__ */
-2
include/asm-v850/types.h
··· 59 59 60 60 typedef u32 dma_addr_t; 61 61 62 - typedef unsigned int kmem_bufctl_t; 63 - 64 62 #endif /* !__ASSEMBLY__ */ 65 63 66 64 #endif /* __KERNEL__ */
-2
include/asm-x86_64/types.h
··· 51 51 typedef u64 sector_t; 52 52 #define HAVE_SECTOR_T 53 53 54 - typedef unsigned short kmem_bufctl_t; 55 - 56 54 #endif /* __ASSEMBLY__ */ 57 55 58 56 #endif /* __KERNEL__ */
-2
include/asm-xtensa/types.h
··· 58 58 59 59 typedef u32 dma_addr_t; 60 60 61 - typedef unsigned int kmem_bufctl_t; 62 - 63 61 #endif /* __KERNEL__ */ 64 62 #endif 65 63
+1
mm/slab.c
··· 189 189 * is less than 512 (PAGE_SIZE<<3), but greater than 256. 190 190 */ 191 191 192 + typedef unsigned int kmem_bufctl_t; 192 193 #define BUFCTL_END (((kmem_bufctl_t)(~0U))-0) 193 194 #define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1) 194 195 #define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2)