Skip to content

Commit 574673c

Browse files
ruprantorvalds
authored andcommitted
printk: Remove unnecessary #ifdef CONFIG_PRINTK
In commit 874f9c7 ("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 <[email protected]> Cc: Joe Perches <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 65ea11e commit 574673c

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

kernel/printk/printk.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,6 @@ asmlinkage int printk_emit(int facility, int level,
19301930
}
19311931
EXPORT_SYMBOL(printk_emit);
19321932

1933-
#ifdef CONFIG_PRINTK
19341933
#define define_pr_level(func, loglevel) \
19351934
asmlinkage __visible void func(const char *fmt, ...) \
19361935
{ \
@@ -1949,7 +1948,6 @@ define_pr_level(__pr_err, LOGLEVEL_ERR);
19491948
define_pr_level(__pr_warn, LOGLEVEL_WARNING);
19501949
define_pr_level(__pr_notice, LOGLEVEL_NOTICE);
19511950
define_pr_level(__pr_info, LOGLEVEL_INFO);
1952-
#endif
19531951

19541952
int vprintk_default(int level, const char *fmt, va_list args)
19551953
{

0 commit comments

Comments
 (0)