Merge branch 'master' into 85xx

[linux-2.6-omap-h63xx.git] / fs / xfs / support / ktrace.c

diff --git a/fs/xfs/support/ktrace.c b/fs/xfs/support/ktrace.c
index 841aa4c15b8a205627ed7e6d2f30cbb2059abaf3..5cf2e86caa7198653b37f086bf02335d2599fad6 100644 (file)
--- a/fs/xfs/support/ktrace.c
+++ b/fs/xfs/support/ktrace.c
@@ -39,8 +39,8 @@ ktrace_init(int zentries)
 void
 ktrace_uninit(void)
 {
-       kmem_cache_destroy(ktrace_hdr_zone);
-       kmem_cache_destroy(ktrace_ent_zone);
+       kmem_zone_destroy(ktrace_hdr_zone);
+       kmem_zone_destroy(ktrace_ent_zone);
 }
 
 /*
@@ -75,7 +75,7 @@ ktrace_alloc(int nentries, unsigned int __nocast sleep)
                                                            sleep);
        } else {
                ktep = (ktrace_entry_t*)kmem_zalloc((nentries * sizeof(*ktep)),
-                                                           sleep);
+                                                           sleep | KM_LARGE);
        }
 
        if (ktep == NULL) {