diff options
author | Andreas Ziegler <andreas.ziegler@fau.de> | 2016-08-04 03:52:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 14:29:39 -0400 |
commit | 574673c231a5fad1560249cc3a598907acb36cf9 (patch) | |
tree | 0fee6ecf9ff36c1678ee09f964aada4de5010ad7 /kernel/printk | |
parent | 65ea11ec6a82b1d44aba62b59e9eb20247e57c6e (diff) |
printk: Remove unnecessary #ifdef CONFIG_PRINTK
In commit 874f9c7da9a4 ("printk: create pr_<level> functions"), new
pr_level defines were added to printk.c.
These new defines are guarded by an #ifdef CONFIG_PRINTK - however,
there is already a surrounding #ifdef CONFIG_PRINTK starting a lot
earlier in line 249 which means the newly introduced #ifdef is
unnecessary.
Let's remove it to avoid confusion.
Signed-off-by: Andreas Ziegler <andreas.ziegler@fau.de>
Cc: Joe Perches <joe@perches.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/printk')
-rw-r--r-- | kernel/printk/printk.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index a5ef95ca18c9..a37fc8cf8e84 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c | |||
@@ -1930,7 +1930,6 @@ asmlinkage int printk_emit(int facility, int level, | |||
1930 | } | 1930 | } |
1931 | EXPORT_SYMBOL(printk_emit); | 1931 | EXPORT_SYMBOL(printk_emit); |
1932 | 1932 | ||
1933 | #ifdef CONFIG_PRINTK | ||
1934 | #define define_pr_level(func, loglevel) \ | 1933 | #define define_pr_level(func, loglevel) \ |
1935 | asmlinkage __visible void func(const char *fmt, ...) \ | 1934 | asmlinkage __visible void func(const char *fmt, ...) \ |
1936 | { \ | 1935 | { \ |
@@ -1949,7 +1948,6 @@ define_pr_level(__pr_err, LOGLEVEL_ERR); | |||
1949 | define_pr_level(__pr_warn, LOGLEVEL_WARNING); | 1948 | define_pr_level(__pr_warn, LOGLEVEL_WARNING); |
1950 | define_pr_level(__pr_notice, LOGLEVEL_NOTICE); | 1949 | define_pr_level(__pr_notice, LOGLEVEL_NOTICE); |
1951 | define_pr_level(__pr_info, LOGLEVEL_INFO); | 1950 | define_pr_level(__pr_info, LOGLEVEL_INFO); |
1952 | #endif | ||
1953 | 1951 | ||
1954 | int vprintk_default(int level, const char *fmt, va_list args) | 1952 | int vprintk_default(int level, const char *fmt, va_list args) |
1955 | { | 1953 | { |