diff for duplicates of <20170518155026.23799-1-npiggin@gmail.com> diff --git a/a/1.txt b/N1/1.txt index c32b1eb..698161c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -175,8 +175,7 @@ index 03e0b69bb5bf..192125f3f8aa 100644 +/* + * Should we panic when a soft-lockup or hard-lockup occurs: + */ -+unsigned int __read_mostly hardlockup_panic = -+ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; ++unsigned int __read_mostly hardlockup_panic + CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; +/* + * We may not want to enable hard lockup detection by default in all cases, + * for example when running the kernel as a guest on a hypervisor. In these @@ -274,8 +273,7 @@ index 03e0b69bb5bf..192125f3f8aa 100644 +#ifdef CONFIG_HARDLOCKUP_DETECTOR static int __init hardlockup_all_cpu_backtrace_setup(char *str) { - sysctl_hardlockup_all_cpu_backtrace = -@@ -128,6 +187,7 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str) + sysctl_hardlockup_all_cpu_backtrace @@ -128,6 +187,7 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str) } __setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup); #endif @@ -292,7 +290,7 @@ index 03e0b69bb5bf..192125f3f8aa 100644 -{ - unsigned long hrint = __this_cpu_read(hrtimer_interrupts); - -- if (__this_cpu_read(hrtimer_interrupts_saved) == hrint) +- if (__this_cpu_read(hrtimer_interrupts_saved) = hrint) - return true; - - __this_cpu_write(hrtimer_interrupts_saved, hrint); @@ -321,7 +319,7 @@ index 03e0b69bb5bf..192125f3f8aa 100644 -int __weak watchdog_nmi_enable(unsigned int cpu) -{ - return 0; -+ if (__this_cpu_read(hrtimer_interrupts_saved) == hrint) ++ if (__this_cpu_read(hrtimer_interrupts_saved) = hrint) + return true; + + __this_cpu_write(hrtimer_interrupts_saved, hrint); @@ -358,7 +356,7 @@ index 03e0b69bb5bf..192125f3f8aa 100644 - if (watchdog_running && !watchdog_suspended) - ret = watchdog_park_threads(); - -- if (ret == 0) +- if (ret = 0) - watchdog_suspended++; - else { - watchdog_disable_all_cpus(); @@ -451,7 +449,7 @@ index 03e0b69bb5bf..192125f3f8aa 100644 + if (watchdog_running && !watchdog_suspended) + ret = watchdog_park_threads(); + -+ if (ret == 0) ++ if (ret = 0) + watchdog_suspended++; + else { + watchdog_disable_all_cpus(); @@ -525,8 +523,7 @@ index 54a427d1f344..2b328d6c0bc8 100644 -/* - * Should we panic when a soft-lockup or hard-lockup occurs: - */ --unsigned int __read_mostly hardlockup_panic = -- CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; +-unsigned int __read_mostly hardlockup_panic - CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; static unsigned long hardlockup_allcpu_dumped; -/* - * We may not want to enable hard lockup detection by default in all cases, diff --git a/a/content_digest b/N1/content_digest index b99e12a..b122798 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Nicholas Piggin <npiggin@gmail.com>\0" "Subject\0[RFC] arch hardlockup detector interfaces improvement\0" - "Date\0Fri, 19 May 2017 01:50:26 +1000\0" + "Date\0Thu, 18 May 2017 15:50:26 +0000\0" "To\0Don Zickus <dzickus@redhat.com>\0" "Cc\0Nicholas Piggin <npiggin@gmail.com>" linux-arch@vger.kernel.org @@ -188,8 +188,7 @@ "+/*\n" "+ * Should we panic when a soft-lockup or hard-lockup occurs:\n" "+ */\n" - "+unsigned int __read_mostly hardlockup_panic =\n" - "+\t\t\tCONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;\n" + "+unsigned int __read_mostly hardlockup_panic +\t\t\tCONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;\n" "+/*\n" "+ * We may not want to enable hard lockup detection by default in all cases,\n" "+ * for example when running the kernel as a guest on a hypervisor. In these\n" @@ -287,8 +286,7 @@ "+#ifdef CONFIG_HARDLOCKUP_DETECTOR\n" " static int __init hardlockup_all_cpu_backtrace_setup(char *str)\n" " {\n" - " \tsysctl_hardlockup_all_cpu_backtrace =\n" - "@@ -128,6 +187,7 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str)\n" + " \tsysctl_hardlockup_all_cpu_backtrace @@ -128,6 +187,7 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str)\n" " }\n" " __setup(\"hardlockup_all_cpu_backtrace=\", hardlockup_all_cpu_backtrace_setup);\n" " #endif\n" @@ -305,7 +303,7 @@ "-{\n" "-\tunsigned long hrint = __this_cpu_read(hrtimer_interrupts);\n" "-\n" - "-\tif (__this_cpu_read(hrtimer_interrupts_saved) == hrint)\n" + "-\tif (__this_cpu_read(hrtimer_interrupts_saved) = hrint)\n" "-\t\treturn true;\n" "-\n" "-\t__this_cpu_write(hrtimer_interrupts_saved, hrint);\n" @@ -334,7 +332,7 @@ "-int __weak watchdog_nmi_enable(unsigned int cpu)\n" "-{\n" "-\treturn 0;\n" - "+\tif (__this_cpu_read(hrtimer_interrupts_saved) == hrint)\n" + "+\tif (__this_cpu_read(hrtimer_interrupts_saved) = hrint)\n" "+\t\treturn true;\n" "+\n" "+\t__this_cpu_write(hrtimer_interrupts_saved, hrint);\n" @@ -371,7 +369,7 @@ "-\tif (watchdog_running && !watchdog_suspended)\n" "-\t\tret = watchdog_park_threads();\n" "-\n" - "-\tif (ret == 0)\n" + "-\tif (ret = 0)\n" "-\t\twatchdog_suspended++;\n" "-\telse {\n" "-\t\twatchdog_disable_all_cpus();\n" @@ -464,7 +462,7 @@ "+\tif (watchdog_running && !watchdog_suspended)\n" "+\t\tret = watchdog_park_threads();\n" "+\n" - "+\tif (ret == 0)\n" + "+\tif (ret = 0)\n" "+\t\twatchdog_suspended++;\n" "+\telse {\n" "+\t\twatchdog_disable_all_cpus();\n" @@ -538,8 +536,7 @@ "-/*\n" "- * Should we panic when a soft-lockup or hard-lockup occurs:\n" "- */\n" - "-unsigned int __read_mostly hardlockup_panic =\n" - "-\t\t\tCONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;\n" + "-unsigned int __read_mostly hardlockup_panic -\t\t\tCONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;\n" " static unsigned long hardlockup_allcpu_dumped;\n" "-/*\n" "- * We may not want to enable hard lockup detection by default in all cases,\n" @@ -634,4 +631,4 @@ "-- \n" 2.11.0 -d4f045a50217d7b36b5fe1f0e37bc9d2aa8e4e354f4777342733559a1b04e122 +df31eb395eec7d1275ca89307f51c2dc1009ed173b0cfbf2b5c8b3347e22db3d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.