lkml.org 
[lkml]   [2017]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch V2 13/29] lockup_detector: Cleanup the ifdef maze
    The #ifdef maze in this file is horrible, Group stuff at least a bit so one
    can figure out what belongs to what.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Don Zickus <dzickus@redhat.com>
    Cc: Chris Metcalf <cmetcalf@mellanox.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Sebastian Siewior <bigeasy@linutronix.de>
    Cc: Nicholas Piggin <npiggin@gmail.com>
    Cc: Ulrich Obergfell <uobergfe@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Link: http://lkml.kernel.org/r/20170831073054.019588340@linutronix.de

    ---
    kernel/watchdog.c | 33 +++++++++++++--------------------
    1 file changed, 13 insertions(+), 20 deletions(-)

    --- a/kernel/watchdog.c
    +++ b/kernel/watchdog.c
    @@ -41,7 +41,6 @@ unsigned long __read_mostly watchdog_ena
    #endif

    #ifdef CONFIG_HARDLOCKUP_DETECTOR
    -/* boot commands */
    /*
    * Should we panic when a soft-lockup or hard-lockup occurs:
    */
    @@ -74,19 +73,21 @@ static int __init hardlockup_panic_setup
    }
    __setup("nmi_watchdog=", hardlockup_panic_setup);

    -#endif
    +# ifdef CONFIG_SMP
    +int __read_mostly sysctl_hardlockup_all_cpu_backtrace;

    -#ifdef CONFIG_SOFTLOCKUP_DETECTOR
    -int __read_mostly soft_watchdog_enabled;
    -#endif
    +static int __init hardlockup_all_cpu_backtrace_setup(char *str)
    +{
    + sysctl_hardlockup_all_cpu_backtrace = !!simple_strtol(str, NULL, 0);
    + return 1;
    +}
    +__setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup);
    +# endif /* CONFIG_SMP */
    +#endif /* CONFIG_HARDLOCKUP_DETECTOR */

    int __read_mostly watchdog_user_enabled;
    int __read_mostly watchdog_thresh = 10;

    -#ifdef CONFIG_SMP
    -int __read_mostly sysctl_softlockup_all_cpu_backtrace;
    -int __read_mostly sysctl_hardlockup_all_cpu_backtrace;
    -#endif
    struct cpumask watchdog_cpumask __read_mostly;
    unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);

    @@ -173,22 +174,14 @@ static int __init nosoftlockup_setup(cha
    __setup("nosoftlockup", nosoftlockup_setup);

    #ifdef CONFIG_SMP
    +int __read_mostly sysctl_softlockup_all_cpu_backtrace;
    +
    static int __init softlockup_all_cpu_backtrace_setup(char *str)
    {
    - sysctl_softlockup_all_cpu_backtrace =
    - !!simple_strtol(str, NULL, 0);
    + sysctl_softlockup_all_cpu_backtrace = !!simple_strtol(str, NULL, 0);
    return 1;
    }
    __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup);
    -#ifdef CONFIG_HARDLOCKUP_DETECTOR
    -static int __init hardlockup_all_cpu_backtrace_setup(char *str)
    -{
    - sysctl_hardlockup_all_cpu_backtrace =
    - !!simple_strtol(str, NULL, 0);
    - return 1;
    -}
    -__setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup);
    -#endif
    #endif

    static void __lockup_detector_cleanup(void);

    \
     
     \ /
      Last update: 2017-09-12 21:55    [W:4.081 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site