thp: fix split_huge_page() after mremap() of THP

[deliverable/linux.git] / kernel / cred.c

diff --git a/kernel/cred.c b/kernel/cred.c
index ec1c07667ec1d5daec2820d6b30cda2bf99818c4..0c0cd8a62285279a521b3f724189fe997da84ddb 100644 (file)
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -20,11 +20,16 @@
 #include <linux/cn_proc.h>
 
 #if 0
-#define kdebug(FMT, ...) \
-       printk("[%-5.5s%5u] "FMT"\n", current->comm, current->pid ,##__VA_ARGS__)
+#define kdebug(FMT, ...)                                               \
+       printk("[%-5.5s%5u] " FMT "\n",                                 \
+              current->comm, current->pid, ##__VA_ARGS__)
 #else
-#define kdebug(FMT, ...) \
-       no_printk("[%-5.5s%5u] "FMT"\n", current->comm, current->pid ,##__VA_ARGS__)
+#define kdebug(FMT, ...)                                               \
+do {                                                                   \
+       if (0)                                                          \
+               no_printk("[%-5.5s%5u] " FMT "\n",                      \
+                         current->comm, current->pid, ##__VA_ARGS__);  \
+} while (0)
 #endif
 
 static struct kmem_cache *cred_jar;
@@ -564,8 +569,8 @@ EXPORT_SYMBOL(revert_creds);
 void __init cred_init(void)
 {
        /* allocate a slab in which we can store credentials */
-       cred_jar = kmem_cache_create("cred_jar", sizeof(struct cred),
-                                    0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+       cred_jar = kmem_cache_create("cred_jar", sizeof(struct cred), 0,
+                       SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT, NULL);
 }
 
 /**