lkml.org 
[lkml]   [2023]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.1 19/53] s390/debug: add _ASM_S390_ prefix to header guard
    Date
    From: Niklas Schnelle <schnelle@linux.ibm.com>

    [ 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>
    ---
    arch/s390/include/asm/debug.h | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/s390/include/asm/debug.h b/arch/s390/include/asm/debug.h
    index 77f24262c25c..ac665b9670c5 100644
    --- a/arch/s390/include/asm/debug.h
    +++ b/arch/s390/include/asm/debug.h
    @@ -4,8 +4,8 @@
    *
    * Copyright IBM Corp. 1999, 2020
    */
    -#ifndef DEBUG_H
    -#define DEBUG_H
    +#ifndef _ASM_S390_DEBUG_H
    +#define _ASM_S390_DEBUG_H

    #include <linux/string.h>
    #include <linux/spinlock.h>
    @@ -487,4 +487,4 @@ void debug_register_static(debug_info_t *id, int pages_per_area, int nr_areas);

    #endif /* MODULE */

    -#endif /* DEBUG_H */
    +#endif /* _ASM_S390_DEBUG_H */
    --
    2.35.1
    \
     
     \ /
      Last update: 2023-03-26 23:42    [W:2.087 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site