diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:25 -0500 |
commit | e18b890bb0881bbab6f4f1a6cd20d9c60d66b003 (patch) | |
tree | 4828be07e1c24781c264b42c5a75bcd968223c3f /kernel | |
parent | 441e143e95f5aa1e04026cb0aa71c801ba53982f (diff) |
[PATCH] slab: remove kmem_cache_t
Replace all uses of kmem_cache_t with struct kmem_cache.
The patch was generated using the following script:
#!/bin/sh
#
# Replace one string by another in all the kernel sources.
#
set -e
for file in `find * -name "*.c" -o -name "*.h"|xargs grep -l $1`; do
quilt add $file
sed -e "1,\$s/$1/$2/g" $file >/tmp/$$
mv /tmp/$$ $file
quilt refresh
done
The script was run like this
sh replace kmem_cache_t "struct kmem_cache"
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/delayacct.c | 2 | ||||
-rw-r--r-- | kernel/fork.c | 16 | ||||
-rw-r--r-- | kernel/pid.c | 2 | ||||
-rw-r--r-- | kernel/posix-timers.c | 2 | ||||
-rw-r--r-- | kernel/signal.c | 2 | ||||
-rw-r--r-- | kernel/taskstats.c | 2 | ||||
-rw-r--r-- | kernel/user.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/kernel/delayacct.c b/kernel/delayacct.c index 70e9ec603082..766d5912b26a 100644 --- a/kernel/delayacct.c +++ b/kernel/delayacct.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/delayacct.h> | 20 | #include <linux/delayacct.h> |
21 | 21 | ||
22 | int delayacct_on __read_mostly = 1; /* Delay accounting turned on/off */ | 22 | int delayacct_on __read_mostly = 1; /* Delay accounting turned on/off */ |
23 | kmem_cache_t *delayacct_cache; | 23 | struct kmem_cache *delayacct_cache; |
24 | 24 | ||
25 | static int __init delayacct_setup_disable(char *str) | 25 | static int __init delayacct_setup_disable(char *str) |
26 | { | 26 | { |
diff --git a/kernel/fork.c b/kernel/fork.c index 711aa5f10da7..2cf74edd3295 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -82,26 +82,26 @@ int nr_processes(void) | |||
82 | #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR | 82 | #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR |
83 | # define alloc_task_struct() kmem_cache_alloc(task_struct_cachep, GFP_KERNEL) | 83 | # define alloc_task_struct() kmem_cache_alloc(task_struct_cachep, GFP_KERNEL) |
84 | # define free_task_struct(tsk) kmem_cache_free(task_struct_cachep, (tsk)) | 84 | # define free_task_struct(tsk) kmem_cache_free(task_struct_cachep, (tsk)) |
85 | static kmem_cache_t *task_struct_cachep; | 85 | static struct kmem_cache *task_struct_cachep; |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | /* SLAB cache for signal_struct structures (tsk->signal) */ | 88 | /* SLAB cache for signal_struct structures (tsk->signal) */ |
89 | static kmem_cache_t *signal_cachep; | 89 | static struct kmem_cache *signal_cachep; |
90 | 90 | ||
91 | /* SLAB cache for sighand_struct structures (tsk->sighand) */ | 91 | /* SLAB cache for sighand_struct structures (tsk->sighand) */ |
92 | kmem_cache_t *sighand_cachep; | 92 | struct kmem_cache *sighand_cachep; |
93 | 93 | ||
94 | /* SLAB cache for files_struct structures (tsk->files) */ | 94 | /* SLAB cache for files_struct structures (tsk->files) */ |
95 | kmem_cache_t *files_cachep; | 95 | struct kmem_cache *files_cachep; |
96 | 96 | ||
97 | /* SLAB cache for fs_struct structures (tsk->fs) */ | 97 | /* SLAB cache for fs_struct structures (tsk->fs) */ |
98 | kmem_cache_t *fs_cachep; | 98 | struct kmem_cache *fs_cachep; |
99 | 99 | ||
100 | /* SLAB cache for vm_area_struct structures */ | 100 | /* SLAB cache for vm_area_struct structures */ |
101 | kmem_cache_t *vm_area_cachep; | 101 | struct kmem_cache *vm_area_cachep; |
102 | 102 | ||
103 | /* SLAB cache for mm_struct structures (tsk->mm) */ | 103 | /* SLAB cache for mm_struct structures (tsk->mm) */ |
104 | static kmem_cache_t *mm_cachep; | 104 | static struct kmem_cache *mm_cachep; |
105 | 105 | ||
106 | void free_task(struct task_struct *tsk) | 106 | void free_task(struct task_struct *tsk) |
107 | { | 107 | { |
@@ -1421,7 +1421,7 @@ long do_fork(unsigned long clone_flags, | |||
1421 | #define ARCH_MIN_MMSTRUCT_ALIGN 0 | 1421 | #define ARCH_MIN_MMSTRUCT_ALIGN 0 |
1422 | #endif | 1422 | #endif |
1423 | 1423 | ||
1424 | static void sighand_ctor(void *data, kmem_cache_t *cachep, unsigned long flags) | 1424 | static void sighand_ctor(void *data, struct kmem_cache *cachep, unsigned long flags) |
1425 | { | 1425 | { |
1426 | struct sighand_struct *sighand = data; | 1426 | struct sighand_struct *sighand = data; |
1427 | 1427 | ||
diff --git a/kernel/pid.c b/kernel/pid.c index b914392085f9..a48879b0b921 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift) | 31 | #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift) |
32 | static struct hlist_head *pid_hash; | 32 | static struct hlist_head *pid_hash; |
33 | static int pidhash_shift; | 33 | static int pidhash_shift; |
34 | static kmem_cache_t *pid_cachep; | 34 | static struct kmem_cache *pid_cachep; |
35 | 35 | ||
36 | int pid_max = PID_MAX_DEFAULT; | 36 | int pid_max = PID_MAX_DEFAULT; |
37 | 37 | ||
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 9cbb5d1be06f..5fe87de10ff0 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -70,7 +70,7 @@ | |||
70 | /* | 70 | /* |
71 | * Lets keep our timers in a slab cache :-) | 71 | * Lets keep our timers in a slab cache :-) |
72 | */ | 72 | */ |
73 | static kmem_cache_t *posix_timers_cache; | 73 | static struct kmem_cache *posix_timers_cache; |
74 | static struct idr posix_timers_id; | 74 | static struct idr posix_timers_id; |
75 | static DEFINE_SPINLOCK(idr_lock); | 75 | static DEFINE_SPINLOCK(idr_lock); |
76 | 76 | ||
diff --git a/kernel/signal.c b/kernel/signal.c index df18c167a2a7..8e19d2785486 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * SLAB caches for signal bits. | 33 | * SLAB caches for signal bits. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | static kmem_cache_t *sigqueue_cachep; | 36 | static struct kmem_cache *sigqueue_cachep; |
37 | 37 | ||
38 | /* | 38 | /* |
39 | * In POSIX a signal is sent either to a specific thread (Linux task) | 39 | * In POSIX a signal is sent either to a specific thread (Linux task) |
diff --git a/kernel/taskstats.c b/kernel/taskstats.c index 1b2b326cf703..f5f92014ae98 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | static DEFINE_PER_CPU(__u32, taskstats_seqnum) = { 0 }; | 35 | static DEFINE_PER_CPU(__u32, taskstats_seqnum) = { 0 }; |
36 | static int family_registered; | 36 | static int family_registered; |
37 | kmem_cache_t *taskstats_cache; | 37 | struct kmem_cache *taskstats_cache; |
38 | 38 | ||
39 | static struct genl_family family = { | 39 | static struct genl_family family = { |
40 | .id = GENL_ID_GENERATE, | 40 | .id = GENL_ID_GENERATE, |
diff --git a/kernel/user.c b/kernel/user.c index c1f93c164c93..4869563080e9 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK) | 26 | #define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK) |
27 | #define uidhashentry(uid) (uidhash_table + __uidhashfn((uid))) | 27 | #define uidhashentry(uid) (uidhash_table + __uidhashfn((uid))) |
28 | 28 | ||
29 | static kmem_cache_t *uid_cachep; | 29 | static struct kmem_cache *uid_cachep; |
30 | static struct list_head uidhash_table[UIDHASH_SZ]; | 30 | static struct list_head uidhash_table[UIDHASH_SZ]; |
31 | 31 | ||
32 | /* | 32 | /* |