提交 e4d35a63 编写于 作者: N Niklas Schnelle 提交者: sanglipeng

s390/debug: add _ASM_S390_ prefix to header guard

stable inclusion
from stable-v5.10.166
commit 2ca345d19cbd694ed9ea086e5b69289c22750a20
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2ca345d19cbd694ed9ea086e5b69289c22750a20

--------------------------------

[ Upstream commit 0d4d5236 ]

Using DEBUG_H without a prefix is very generic and inconsistent with
other header guards in arch/s390/include/asm. In fact it collides with
the same name in the ath9k wireless driver though that depends on !S390
via disabled wireless support. Let's just use a consistent header guard
name and prevent possible future trouble.
Signed-off-by: NNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: NHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 6c08a2d2
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* *
* Copyright IBM Corp. 1999, 2020 * Copyright IBM Corp. 1999, 2020
*/ */
#ifndef DEBUG_H #ifndef _ASM_S390_DEBUG_H
#define DEBUG_H #define _ASM_S390_DEBUG_H
#include <linux/string.h> #include <linux/string.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
...@@ -425,4 +425,4 @@ int debug_unregister_view(debug_info_t *id, struct debug_view *view); ...@@ -425,4 +425,4 @@ int debug_unregister_view(debug_info_t *id, struct debug_view *view);
#define PRINT_FATAL(x...) printk(KERN_DEBUG PRINTK_HEADER x) #define PRINT_FATAL(x...) printk(KERN_DEBUG PRINTK_HEADER x)
#endif /* DASD_DEBUG */ #endif /* DASD_DEBUG */
#endif /* DEBUG_H */ #endif /* _ASM_S390_DEBUG_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册