diff for duplicates of <56A68D5F.40406@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index 323b9a9..1c080db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ Guenter > (default=kernel config parameter) > ------------------------------------------------- > +sun4v_wdt: -> +timeout_ms: Watchdog timeout in milliseconds 1..180000, default=60000) +> +timeout_ms: Watchdog timeout in milliseconds 1..180000, default`000) > +nowayout: Watchdog cannot be stopped once started > +------------------------------------------------- > diff --git a/arch/sparc/kernel/hvcalls.S b/arch/sparc/kernel/hvcalls.S @@ -175,7 +175,7 @@ Guenter > + int hverr; > + > + hverr = sun4v_mach_set_watchdog(wdd->timeout, NULL); -> + if (hverr == HV_EINVAL) +> + if (hverr = HV_EINVAL) > + return -EINVAL; > + > + return 0; @@ -247,7 +247,7 @@ Guenter > + return -ENODEV; > + > + node = mdesc_node_by_name(handle, MDESC_NODE_NULL, "platform"); -> + if (node == MDESC_NODE_NULL) { +> + if (node = MDESC_NODE_NULL) { > + mdesc_release(handle); > + return -ENODEV; > + } @@ -255,7 +255,7 @@ Guenter > + value = mdesc_get_property(handle, node, "watchdog-resolution", NULL); > + if (value) { > + wdt_resolution_ms = *value; -> + if (wdt_resolution_ms == 0 || +> + if (wdt_resolution_ms = 0 || > + wdt_resolution_ms > WDT_DEFAULT_RESOLUTION_MS) > + wdt_resolution_ms = WDT_DEFAULT_RESOLUTION_MS; > + } diff --git a/a/content_digest b/N1/content_digest index ae2d8b8..dc27586 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01453754288-30997-1-git-send-email-wim.coekaerts@oracle.com\0" "From\0Guenter Roeck <linux@roeck-us.net>\0" "Subject\0Re: [PATCH v3] Add sun4v_wdt watchdog driver\0" - "Date\0Mon, 25 Jan 2016 13:02:23 -0800\0" + "Date\0Mon, 25 Jan 2016 21:02:23 +0000\0" "To\0Wim Coekaerts <wim.coekaerts@oracle.com>" " wim@iguana.be\0" "Cc\0linux-watchdog@vger.kernel.org" @@ -60,7 +60,7 @@ "> \t(default=kernel config parameter)\n" "> -------------------------------------------------\n" "> +sun4v_wdt:\n" - "> +timeout_ms: Watchdog timeout in milliseconds 1..180000, default=60000)\n" + "> +timeout_ms: Watchdog timeout in milliseconds 1..180000, default`000)\n" "> +nowayout: Watchdog cannot be stopped once started\n" "> +-------------------------------------------------\n" "> diff --git a/arch/sparc/kernel/hvcalls.S b/arch/sparc/kernel/hvcalls.S\n" @@ -185,7 +185,7 @@ "> +\tint hverr;\n" "> +\n" "> +\thverr = sun4v_mach_set_watchdog(wdd->timeout, NULL);\n" - "> +\tif (hverr == HV_EINVAL)\n" + "> +\tif (hverr = HV_EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\treturn 0;\n" @@ -257,7 +257,7 @@ "> +\t\treturn -ENODEV;\n" "> +\n" "> +\tnode = mdesc_node_by_name(handle, MDESC_NODE_NULL, \"platform\");\n" - "> +\tif (node == MDESC_NODE_NULL) {\n" + "> +\tif (node = MDESC_NODE_NULL) {\n" "> +\t\tmdesc_release(handle);\n" "> +\t\treturn -ENODEV;\n" "> +\t}\n" @@ -265,7 +265,7 @@ "> +\tvalue = mdesc_get_property(handle, node, \"watchdog-resolution\", NULL);\n" "> +\tif (value) {\n" "> +\t\twdt_resolution_ms = *value;\n" - "> +\t\tif (wdt_resolution_ms == 0 ||\n" + "> +\t\tif (wdt_resolution_ms = 0 ||\n" "> +\t\t wdt_resolution_ms > WDT_DEFAULT_RESOLUTION_MS)\n" "> +\t\t\twdt_resolution_ms = WDT_DEFAULT_RESOLUTION_MS;\n" "> +\t}\n" @@ -335,4 +335,4 @@ "> +MODULE_LICENSE(\"GPL\");\n" > -2131861523dab5e6ffdc007d7121403db7585be38880abf16bb622f8779e5e7a +1cd1b368548bffe8b8feed571ae4c158b902c90681e3ac28555de0b204950196
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.