diff -r 79e63ca47e09 include/asm-alpha/types.h
--- a/include/asm-alpha/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-alpha/types.h	Sun Aug 28 21:59:49 2005
@@ -56,8 +56,6 @@
 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 -r 79e63ca47e09 include/asm-arm/types.h
--- a/include/asm-arm/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-arm/types.h	Sun Aug 28 21:59:49 2005
@@ -52,8 +52,6 @@
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-arm26/types.h
--- a/include/asm-arm26/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-arm26/types.h	Sun Aug 28 21:59:49 2005
@@ -52,8 +52,6 @@
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-cris/types.h
--- a/include/asm-cris/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-cris/types.h	Sun Aug 28 21:59:49 2005
@@ -52,8 +52,6 @@
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-frv/types.h
--- a/include/asm-frv/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-frv/types.h	Sun Aug 28 21:59:49 2005
@@ -65,8 +65,6 @@
 
 typedef u32 dma_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-h8300/types.h
--- a/include/asm-h8300/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-h8300/types.h	Sun Aug 28 21:59:49 2005
@@ -58,8 +58,6 @@
 #define HAVE_SECTOR_T
 typedef u64 sector_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __KERNEL__ */
 
 #endif /* __ASSEMBLY__ */
diff -r 79e63ca47e09 include/asm-i386/types.h
--- a/include/asm-i386/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-i386/types.h	Sun Aug 28 21:59:49 2005
@@ -63,8 +63,6 @@
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-ia64/types.h
--- a/include/asm-ia64/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-ia64/types.h	Sun Aug 28 21:59:49 2005
@@ -67,8 +67,6 @@
 
 typedef u64 dma_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 # endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
 
diff -r 79e63ca47e09 include/asm-m32r/types.h
--- a/include/asm-m32r/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-m32r/types.h	Sun Aug 28 21:59:49 2005
@@ -55,8 +55,6 @@
 typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-m68k/types.h
--- a/include/asm-m68k/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-m68k/types.h	Sun Aug 28 21:59:49 2005
@@ -60,8 +60,6 @@
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-mips/types.h
--- a/include/asm-mips/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-mips/types.h	Sun Aug 28 21:59:49 2005
@@ -99,8 +99,6 @@
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-parisc/types.h
--- a/include/asm-parisc/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-parisc/types.h	Sun Aug 28 21:59:49 2005
@@ -56,8 +56,6 @@
 typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-ppc/types.h
--- a/include/asm-ppc/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-ppc/types.h	Sun Aug 28 21:59:49 2005
@@ -62,8 +62,6 @@
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-ppc64/types.h
--- a/include/asm-ppc64/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-ppc64/types.h	Sun Aug 28 21:59:49 2005
@@ -72,7 +72,6 @@
 	unsigned long env;
 } func_descr_t;
 
-typedef unsigned int kmem_bufctl_t;
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-s390/types.h
--- a/include/asm-s390/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-s390/types.h	Sun Aug 28 21:59:49 2005
@@ -79,8 +79,6 @@
 
 typedef u32 dma_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #ifndef __s390x__
 typedef union {
 	unsigned long long pair;
diff -r 79e63ca47e09 include/asm-sh/types.h
--- a/include/asm-sh/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-sh/types.h	Sun Aug 28 21:59:49 2005
@@ -58,8 +58,6 @@
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-sh64/types.h
--- a/include/asm-sh64/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-sh64/types.h	Sun Aug 28 21:59:49 2005
@@ -65,8 +65,6 @@
 #endif
 typedef u64 dma64_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #define BITS_PER_LONG 32
diff -r 79e63ca47e09 include/asm-sparc/types.h
--- a/include/asm-sparc/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-sparc/types.h	Sun Aug 28 21:59:49 2005
@@ -54,8 +54,6 @@
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-sparc64/types.h
--- a/include/asm-sparc64/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-sparc64/types.h	Sun Aug 28 21:59:49 2005
@@ -56,8 +56,6 @@
 typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-v850/types.h
--- a/include/asm-v850/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-v850/types.h	Sun Aug 28 21:59:49 2005
@@ -59,8 +59,6 @@
 
 typedef u32 dma_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* !__ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-x86_64/types.h
--- a/include/asm-x86_64/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-x86_64/types.h	Sun Aug 28 21:59:49 2005
@@ -51,8 +51,6 @@
 typedef u64 sector_t;
 #define HAVE_SECTOR_T
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff -r 79e63ca47e09 include/asm-xtensa/types.h
--- a/include/asm-xtensa/types.h	Fri Aug 26 18:39:19 2005
+++ b/include/asm-xtensa/types.h	Sun Aug 28 21:59:49 2005
@@ -58,8 +58,6 @@
 
 typedef u32 dma_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif	/* __KERNEL__ */
 #endif
 
diff -r 79e63ca47e09 mm/slab.c
--- a/mm/slab.c	Fri Aug 26 18:39:19 2005
+++ b/mm/slab.c	Sun Aug 28 21:59:49 2005
@@ -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)