diff for duplicates of <56AB5358.9090405@oracle.com> diff --git a/a/1.txt b/N1/1.txt index 1bfce1b..11ede6e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,7 +61,7 @@ On 01/29/2016 12:46 AM, Wim Coekaerts wrote: > (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 @@ -190,7 +190,7 @@ On 01/29/2016 12:46 AM, Wim Coekaerts wrote: > + * watchdog resolution in milliseconds. > + */ > + hverr = sun4v_mach_set_watchdog(wdd->timeout * 1000, NULL); -> + if (hverr == HV_EINVAL) +> + if (hverr = HV_EINVAL) > + return -EINVAL; > + > + return 0; @@ -251,7 +251,7 @@ On 01/29/2016 12:46 AM, Wim Coekaerts wrote: > + > + node = mdesc_node_by_name(handle, MDESC_NODE_NULL, "platform"); > + err = -ENODEV; -> + if (node == MDESC_NODE_NULL) +> + if (node = MDESC_NODE_NULL) > + goto out_release; > + > + /* @@ -266,7 +266,7 @@ On 01/29/2016 12:46 AM, Wim Coekaerts wrote: > + err = -EINVAL; > + if (value) { > + wdt_resolution_property = *value; -> + if (wdt_resolution_property == 0 || +> + if (wdt_resolution_property = 0 || > + wdt_resolution_property > WDT_DEFAULT_RESOLUTION_MS) > + goto out_hv_unreg; > + } diff --git a/a/content_digest b/N1/content_digest index b77db59..cbcd50f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01454017572-5235-1-git-send-email-wim.coekaerts@oracle.com\0" "From\0Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>\0" "Subject\0Re: [PATCH v6] Add sun4v_wdt watchdog driver\0" - "Date\0Fri, 29 Jan 2016 14:56:08 +0300\0" + "Date\0Fri, 29 Jan 2016 11:56:08 +0000\0" "To\0Wim Coekaerts <wim.coekaerts@oracle.com>" wim@iguana.be " linux@roeck-us.net\0" @@ -72,7 +72,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" @@ -201,7 +201,7 @@ "> +\t * watchdog resolution in milliseconds.\n" "> +\t */\n" "> +\thverr = sun4v_mach_set_watchdog(wdd->timeout * 1000, NULL);\n" - "> +\tif (hverr == HV_EINVAL)\n" + "> +\tif (hverr = HV_EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\treturn 0;\n" @@ -262,7 +262,7 @@ "> +\n" "> +\tnode = mdesc_node_by_name(handle, MDESC_NODE_NULL, \"platform\");\n" "> +\terr = -ENODEV;\n" - "> +\tif (node == MDESC_NODE_NULL)\n" + "> +\tif (node = MDESC_NODE_NULL)\n" "> +\t\tgoto out_release;\n" "> +\n" "> +\t/*\n" @@ -277,7 +277,7 @@ "> +\terr = -EINVAL;\n" "> +\tif (value) {\n" "> +\t\twdt_resolution_property = *value;\n" - "> +\t\tif (wdt_resolution_property == 0 ||\n" + "> +\t\tif (wdt_resolution_property = 0 ||\n" "> +\t\t wdt_resolution_property > WDT_DEFAULT_RESOLUTION_MS)\n" "> +\t\t\tgoto out_hv_unreg;\n" "> +\t}\n" @@ -318,4 +318,4 @@ "\n" Thanks. -84d856c0581760d70110f10a0cfd8e64ad722fb84fe93c797895c3d46f8fb550 +23ced10ca4d2d9bdcef0ac0834efbf01e1aa93b54d95c459f7f459d2f942c726
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.