X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Fdelayacct.c;h=c0148ae992c4aaee7295c50a6670a1ffc6c13b33;hb=5b982c5bb7db5cfbc15236d9d45cec32e5472ed5;hp=66a0ea48751d647abb56f7e4741e3f0d02dd7b4e;hpb=0bd2af46839ad6262d25714a6ec0365db9d6b98f;p=powerpc.git

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index 66a0ea4875..c0148ae992 100644
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -20,7 +20,7 @@
 #include <linux/delayacct.h>
 
 int delayacct_on __read_mostly = 1;	/* Delay accounting turned on/off */
-kmem_cache_t *delayacct_cache;
+struct kmem_cache *delayacct_cache;
 
 static int __init delayacct_setup_disable(char *str)
 {
@@ -31,17 +31,13 @@ __setup("nodelayacct", delayacct_setup_disable);
 
 void delayacct_init(void)
 {
-	delayacct_cache = kmem_cache_create("delayacct_cache",
-					sizeof(struct task_delay_info),
-					0,
-					SLAB_PANIC,
-					NULL, NULL);
+	delayacct_cache = KMEM_CACHE(task_delay_info, SLAB_PANIC);
 	delayacct_tsk_init(&init_task);
 }
 
 void __delayacct_tsk_init(struct task_struct *tsk)
 {
-	tsk->delays = kmem_cache_zalloc(delayacct_cache, SLAB_KERNEL);
+	tsk->delays = kmem_cache_zalloc(delayacct_cache, GFP_KERNEL);
 	if (tsk->delays)
 		spin_lock_init(&tsk->delays->lock);
 }