memcg, slab: do not destroy children caches if parent has aliases

[karo-tx-linux.git] / include / linux / printk.h

diff --git a/include/linux/printk.h b/include/linux/printk.h
index fa47e2708c01748a958f40300c900673cfaa3777..8752f7595b2759712f760c3924a2110fef5ca7d5 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -24,13 +24,9 @@ static inline int printk_get_level(const char *buffer)
 
 static inline const char *printk_skip_level(const char *buffer)
 {
-       if (printk_get_level(buffer)) {
-               switch (buffer[1]) {
-               case '0' ... '7':
-               case 'd':       /* KERN_DEFAULT */
-                       return buffer + 2;
-               }
-       }
+       if (printk_get_level(buffer))
+               return buffer + 2;
+
        return buffer;
 }
 
@@ -124,9 +120,9 @@ asmlinkage __printf(1, 0)
 int vprintk(const char *fmt, va_list args);
 
 asmlinkage __printf(5, 6) __cold
-asmlinkage int printk_emit(int facility, int level,
-                          const char *dict, size_t dictlen,
-                          const char *fmt, ...);
+int printk_emit(int facility, int level,
+               const char *dict, size_t dictlen,
+               const char *fmt, ...);
 
 asmlinkage __printf(1, 2) __cold
 int printk(const char *fmt, ...);