[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>

diff --git a/include/asm-alpha/types.h b/include/asm-alpha/types.h
index 43264d21924656fdc5b623367d83c7eccf105090..f5716139ec8987216d954858dfe6229ecd542488 100644 (file)
--- a/include/asm-alpha/types.h
+++ b/include/asm-alpha/types.h
@@ -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 */

diff --git a/include/asm-arm/types.h b/include/asm-arm/types.h
index f4c92e4c8c0219a31b69f8d59367c105d5767fef..22992ee0627ac3fb5c87bfa4c297184b8bfd1628 100644 (file)
--- a/include/asm-arm/types.h
+++ b/include/asm-arm/types.h
@@ -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__ */

diff --git a/include/asm-arm26/types.h b/include/asm-arm26/types.h
index 56cbe573a2349e8aac93d334def241763a9cd5cb..81bd357ada02b931a04f93c9405e139b64d4cde9 100644 (file)
--- a/include/asm-arm26/types.h
+++ b/include/asm-arm26/types.h
@@ -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__ */

diff --git a/include/asm-cris/types.h b/include/asm-cris/types.h
index 8fa6d6c7afce5f19de6c0bac4abbffd0f4bdd646..84557c9bac93e4ef7993eae2c0576644a601719b 100644 (file)
--- a/include/asm-cris/types.h
+++ b/include/asm-cris/types.h
@@ -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__ */

diff --git a/include/asm-frv/types.h b/include/asm-frv/types.h
index 1a5b6546bb411fe404f22a0af1337e7faa7d0632..50605df6d8acbc024adcba5f4c7aabe1ac57ca14 100644 (file)
--- a/include/asm-frv/types.h
+++ b/include/asm-frv/types.h
@@ -65,8 +65,6 @@ typedef u64 u_quad_t;
 
 typedef u32 dma_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-h8300/types.h b/include/asm-h8300/types.h
index 21f4fc07ac0e45ae6fa9c07ce671887fdaf52eb6..bf91e0d4dde77775a46650f29f107096c2914147 100644 (file)
--- a/include/asm-h8300/types.h
+++ b/include/asm-h8300/types.h
@@ -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__ */

diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h
index 901b77c42b8a70e860c95766641904b6fb5468d5..ced00fe8fe61c0667840795158b234c58fa35ebc 100644 (file)
--- a/include/asm-i386/types.h
+++ b/include/asm-i386/types.h
@@ -63,8 +63,6 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-ia64/types.h b/include/asm-ia64/types.h
index a677565aa95451f13191db59cfb935e9f0808aab..902850d12424daa1a492f569adc701b4596e96cf 100644 (file)
--- a/include/asm-ia64/types.h
+++ b/include/asm-ia64/types.h
@@ -67,8 +67,6 @@ typedef __u64 u64;
 
 typedef u64 dma_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 # endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
 

diff --git a/include/asm-m32r/types.h b/include/asm-m32r/types.h
index ca0a887d2237167e313a6aa59643a59e2ade6287..fcf24c64c3ba4650d001dbf9dfa770583df51bed 100644 (file)
--- a/include/asm-m32r/types.h
+++ b/include/asm-m32r/types.h
@@ -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__ */

diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h
index f391cbe39b965c68c9fcfdc1301ccc31c21ba897..b5a1febc97d41d2658d6d25552d788ed3f1ce6ca 100644 (file)
--- a/include/asm-m68k/types.h
+++ b/include/asm-m68k/types.h
@@ -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__ */

diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h
index d2f0c76b00a9f85a817e3e1436243e8eb93d9bfe..b949ab33e8e2f339389ffe27b6173ac7180e08de 100644 (file)
--- a/include/asm-mips/types.h
+++ b/include/asm-mips/types.h
@@ -99,8 +99,6 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-parisc/types.h b/include/asm-parisc/types.h
index 8fe7a44ea205d4a3059b61c089ed0c4a747ee31b..d21b9d0d63eabc37485671c951a7fc2dee470775 100644 (file)
--- a/include/asm-parisc/types.h
+++ b/include/asm-parisc/types.h
@@ -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__ */

diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h
index a787bc0325879dbc6e1bf649fbb6ec8b4867aeea..77dc24d7d2ad1910151cb23d48279e7ef3a6abd0 100644 (file)
--- a/include/asm-ppc/types.h
+++ b/include/asm-ppc/types.h
@@ -62,8 +62,6 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-ppc64/types.h b/include/asm-ppc64/types.h
index 5b8c2cfa11382248105b00937eec2d245411ac3c..bf294c1761b235817eeaad8a97c75311ac11b371 100644 (file)
--- a/include/asm-ppc64/types.h
+++ b/include/asm-ppc64/types.h
@@ -72,7 +72,6 @@ typedef struct {
        unsigned long env;
 } func_descr_t;
 
-typedef unsigned int kmem_bufctl_t;
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index 3fefd61416a515e2459cd3b39edf2079cf682137..d0be3e477013de865a513c84096753eb9b1e6bfb 100644 (file)
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -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;

diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h
index c4dc126c56211cac02e2b92c06b4151cc555bf73..cb7e183a0a6beabbec8b1b0dd14d3fd53886caaa 100644 (file)
--- a/include/asm-sh/types.h
+++ b/include/asm-sh/types.h
@@ -58,8 +58,6 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-sh64/types.h b/include/asm-sh64/types.h
index 41d4d2f82aa99dbf51f8af1438f1009964f2ba90..8d41db2153b599bcd618a47bff5726bd9d7828bd 100644 (file)
--- a/include/asm-sh64/types.h
+++ b/include/asm-sh64/types.h
@@ -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

diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h
index 9eabf6e61ccca66753b3ab213735f6cee7900402..42fc6ed9815690e563fceb6ca1590df9e86f5df4 100644 (file)
--- a/include/asm-sparc/types.h
+++ b/include/asm-sparc/types.h
@@ -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__ */

diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h
index 6248ed1a9a7a7be2f5822e58d9dce7c75b41a152..d0ee7f105838abadfb8b47504a6d0033d49347b8 100644 (file)
--- a/include/asm-sparc64/types.h
+++ b/include/asm-sparc64/types.h
@@ -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__ */

diff --git a/include/asm-v850/types.h b/include/asm-v850/types.h
index e7cfe5b33a103252e4f641eb2b9a80813a6bcae8..dcef5719687501bc39ceabff1c95e0d978996243 100644 (file)
--- a/include/asm-v850/types.h
+++ b/include/asm-v850/types.h
@@ -59,8 +59,6 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* !__ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-x86_64/types.h b/include/asm-x86_64/types.h
index 32bd1426b523dec2d2e251a9902295f6f628f023..c86c2e6793e2a87b55224a7d17f9dfa077ae75e3 100644 (file)
--- a/include/asm-x86_64/types.h
+++ b/include/asm-x86_64/types.h
@@ -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__ */

diff --git a/include/asm-xtensa/types.h b/include/asm-xtensa/types.h
index ebac004698520fab778f8a9c2298208a606395e6..9d99a8e9e337101af6fc2bb6881cabc85103915d 100644 (file)
--- a/include/asm-xtensa/types.h
+++ b/include/asm-xtensa/types.h
@@ -58,8 +58,6 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __KERNEL__ */
 #endif
 

diff --git a/mm/slab.c b/mm/slab.c
index ae6cca04de4bc7cdbf0d3586ae3af12f12dd0808..59d382fbca1ccf74faafe538b600d92e4ea01dd0 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -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)