Commit 1ec79234 authored Jan 03, 2023 by Niklas Schnelle Committed by Greg Kroah-Hartman Feb 06, 2023

s390/debug: add _ASM_S390_ prefix to header guard



[ Upstream commit 0d4d52361b6c29bf771acd4fa461f06d78fb2fac ]

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: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 18699224

arch/s390/include/asm/debug.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,8 +4,8 @@
		*
		* Copyright IBM Corp. 1999, 2000
		*/
		#ifndef DEBUG_H
		#define DEBUG_H
		#ifndef _ASM_S390_DEBUG_H
		#define _ASM_S390_DEBUG_H

		#include <linux/string.h>
		#include <linux/spinlock.h>
		@@ -416,4 +416,4 @@ int debug_unregister_view(debug_info_t id, struct debug_view view);
		#define PRINT_FATAL(x...) printk(KERN_DEBUG PRINTK_HEADER x)
		#endif /* DASD_DEBUG */

		#endif /* DEBUG_H */
		#endif /* _ASM_S390_DEBUG_H */