diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /fs/xfs | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/linux-2.6/kmem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h index 8f82c1a20d..c64a29cdff 100644 --- a/fs/xfs/linux-2.6/kmem.h +++ b/fs/xfs/linux-2.6/kmem.h | |||
| @@ -30,8 +30,8 @@ | |||
| 30 | #define KM_NOFS 0x0004u | 30 | #define KM_NOFS 0x0004u |
| 31 | #define KM_MAYFAIL 0x0008u | 31 | #define KM_MAYFAIL 0x0008u |
| 32 | 32 | ||
| 33 | #define kmem_zone kmem_cache_s | 33 | #define kmem_zone kmem_cache |
| 34 | #define kmem_zone_t kmem_cache_t | 34 | #define kmem_zone_t struct kmem_cache |
| 35 | 35 | ||
| 36 | typedef unsigned long xfs_pflags_t; | 36 | typedef unsigned long xfs_pflags_t; |
| 37 | 37 | ||