Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 6878
b: refs/heads/master
c: fa5b08d
h: refs/heads/master
v: v3
  • Loading branch information
Kyle Moffett authored and Linus Torvalds committed Sep 5, 2005
1 parent 01154df commit b520abc
Show file tree
Hide file tree
Showing 24 changed files with 2 additions and 44 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0e5c9f39f64d8a55c5db37a5ea43e37d3422fd92
refs/heads/master: fa5b08d5f818063d18433194f20359ef2ae50254
2 changes: 0 additions & 2 deletions trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 b520abc

Please sign in to comment.