]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mm/internal.h: don't split printk call in two
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Thu, 12 Feb 2015 23:00:02 +0000 (15:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Feb 2015 02:54:10 +0000 (18:54 -0800)
All users of mminit_dprintk pass a compile-time constant as level, so this
just makes gcc emit a single printk call instead of two.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Rik van Riel <riel@redhat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Vishnu Pratap Singh <vishnu.ps@samsung.com>
Cc: Pintu Kumar <pintu.k@samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/internal.h

index c4d6c9b43491d56bebdb852db50b0a96f0f06ffa..a96da5b0029dc4a2837f558534f436990ef42894 100644 (file)
@@ -351,8 +351,10 @@ extern int mminit_loglevel;
 #define mminit_dprintk(level, prefix, fmt, arg...) \
 do { \
        if (level < mminit_loglevel) { \
-               printk(level <= MMINIT_WARNING ? KERN_WARNING : KERN_DEBUG); \
-               printk(KERN_CONT "mminit::" prefix " " fmt, ##arg); \
+               if (level <= MMINIT_WARNING) \
+                       printk(KERN_WARNING "mminit::" prefix " " fmt, ##arg); \
+               else \
+                       printk(KERN_DEBUG "mminit::" prefix " " fmt, ##arg); \
        } \
 } while (0)