From: Greg Kroah-Hartman Date: Mon, 25 Feb 2019 19:50:01 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.9.161~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=551ddb15a872ddd4dd9e1c091d90fa73d7766132;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: phy-tegra-remove-redundant-self-assignment-of-map.patch pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch sched-sysctl-fix-attributes-of-some-extern-declarations.patch --- diff --git a/queue-4.14/phy-tegra-remove-redundant-self-assignment-of-map.patch b/queue-4.14/phy-tegra-remove-redundant-self-assignment-of-map.patch new file mode 100644 index 00000000000..f667a85ef8d --- /dev/null +++ b/queue-4.14/phy-tegra-remove-redundant-self-assignment-of-map.patch @@ -0,0 +1,32 @@ +From a0dd6773038f3fd2bd1b4f7ec193887cffc49046 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Thu, 23 Nov 2017 11:10:47 +0000 +Subject: phy: tegra: remove redundant self assignment of 'map' + +From: Colin Ian King + +commit a0dd6773038f3fd2bd1b4f7ec193887cffc49046 upstream. + +The assignment of map to itself is redundant and can be removed. +Detected with Coccinelle. + +Signed-off-by: Colin Ian King +Signed-off-by: Kishon Vijay Abraham I +Cc: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/phy/tegra/xusb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/phy/tegra/xusb.c ++++ b/drivers/phy/tegra/xusb.c +@@ -418,7 +418,7 @@ tegra_xusb_port_find_lane(struct tegra_x + { + struct tegra_xusb_lane *lane, *match = ERR_PTR(-ENODEV); + +- for (map = map; map->type; map++) { ++ for (; map->type; map++) { + if (port->index != map->port) + continue; + diff --git a/queue-4.14/pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch b/queue-4.14/pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch new file mode 100644 index 00000000000..8727393e3de --- /dev/null +++ b/queue-4.14/pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch @@ -0,0 +1,55 @@ +From 1f60652dd586d1b3eee7c4602892a97a62fa937a Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 31 Oct 2018 17:50:21 -0700 +Subject: pinctrl: max77620: Use define directive for max77620_pinconf_param values + +From: Nathan Chancellor + +commit 1f60652dd586d1b3eee7c4602892a97a62fa937a upstream. + +Clang warns when one enumerated type is implicitly converted to another: + +drivers/pinctrl/pinctrl-max77620.c:56:12: warning: implicit conversion +from enumeration type 'enum max77620_pinconf_param' to different +enumeration type 'enum pin_config_param' [-Wenum-conversion] + .param = MAX77620_ACTIVE_FPS_SOURCE, + ^~~~~~~~~~~~~~~~~~~~~~~~~~ + +It is expected that pinctrl drivers can extend pin_config_param because +of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion +isn't an issue. Most drivers that take advantage of this define the +PIN_CONFIG variables as constants, rather than enumerated values. Do the +same thing here so that Clang no longer warns. + +Link: https://github.com/ClangBuiltLinux/linux/issues/139 +Signed-off-by: Nathan Chancellor +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pinctrl/pinctrl-max77620.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +--- a/drivers/pinctrl/pinctrl-max77620.c ++++ b/drivers/pinctrl/pinctrl-max77620.c +@@ -34,14 +34,12 @@ enum max77620_pin_ppdrv { + MAX77620_PIN_PP_DRV, + }; + +-enum max77620_pinconf_param { +- MAX77620_ACTIVE_FPS_SOURCE = PIN_CONFIG_END + 1, +- MAX77620_ACTIVE_FPS_POWER_ON_SLOTS, +- MAX77620_ACTIVE_FPS_POWER_DOWN_SLOTS, +- MAX77620_SUSPEND_FPS_SOURCE, +- MAX77620_SUSPEND_FPS_POWER_ON_SLOTS, +- MAX77620_SUSPEND_FPS_POWER_DOWN_SLOTS, +-}; ++#define MAX77620_ACTIVE_FPS_SOURCE (PIN_CONFIG_END + 1) ++#define MAX77620_ACTIVE_FPS_POWER_ON_SLOTS (PIN_CONFIG_END + 2) ++#define MAX77620_ACTIVE_FPS_POWER_DOWN_SLOTS (PIN_CONFIG_END + 3) ++#define MAX77620_SUSPEND_FPS_SOURCE (PIN_CONFIG_END + 4) ++#define MAX77620_SUSPEND_FPS_POWER_ON_SLOTS (PIN_CONFIG_END + 5) ++#define MAX77620_SUSPEND_FPS_POWER_DOWN_SLOTS (PIN_CONFIG_END + 6) + + struct max77620_pin_function { + const char *name; diff --git a/queue-4.14/sched-sysctl-fix-attributes-of-some-extern-declarations.patch b/queue-4.14/sched-sysctl-fix-attributes-of-some-extern-declarations.patch new file mode 100644 index 00000000000..925777c16b4 --- /dev/null +++ b/queue-4.14/sched-sysctl-fix-attributes-of-some-extern-declarations.patch @@ -0,0 +1,58 @@ +From a9903f04e0a4ea522d959c2f287cdf0ab029e324 Mon Sep 17 00:00:00 2001 +From: Matthias Kaehlcke +Date: Mon, 30 Oct 2017 11:08:16 -0700 +Subject: sched/sysctl: Fix attributes of some extern declarations + +From: Matthias Kaehlcke + +commit a9903f04e0a4ea522d959c2f287cdf0ab029e324 upstream. + +The definition of sysctl_sched_migration_cost, sysctl_sched_nr_migrate +and sysctl_sched_time_avg includes the attribute const_debug. This +attribute is not part of the extern declaration of these variables in +include/linux/sched/sysctl.h, while it is in kernel/sched/sched.h, +and as a result Clang generates warnings like this: + + kernel/sched/sched.h:1618:33: warning: section attribute is specified on redeclared variable [-Wsection] + extern const_debug unsigned int sysctl_sched_time_avg; + ^ + ./include/linux/sched/sysctl.h:42:21: note: previous declaration is here + extern unsigned int sysctl_sched_time_avg; + +The header only declares the variables when CONFIG_SCHED_DEBUG is defined, +therefore it is not necessary to duplicate the definition of const_debug. +Instead we can use the attribute __read_mostly, which is the expansion of +const_debug when CONFIG_SCHED_DEBUG=y is set. + +Signed-off-by: Matthias Kaehlcke +Reviewed-by: Nick Desaulniers +Cc: Douglas Anderson +Cc: Guenter Roeck +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Shile Zhang +Cc: Thomas Gleixner +Link: http://lkml.kernel.org/r/20171030180816.170850-1-mka@chromium.org +Signed-off-by: Ingo Molnar +Cc: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/sched/sysctl.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/include/linux/sched/sysctl.h ++++ b/include/linux/sched/sysctl.h +@@ -38,9 +38,9 @@ extern unsigned int sysctl_numa_balancin + extern unsigned int sysctl_numa_balancing_scan_size; + + #ifdef CONFIG_SCHED_DEBUG +-extern unsigned int sysctl_sched_migration_cost; +-extern unsigned int sysctl_sched_nr_migrate; +-extern unsigned int sysctl_sched_time_avg; ++extern __read_mostly unsigned int sysctl_sched_migration_cost; ++extern __read_mostly unsigned int sysctl_sched_nr_migrate; ++extern __read_mostly unsigned int sysctl_sched_time_avg; + + int sched_proc_update_handler(struct ctl_table *table, int write, + void __user *buffer, size_t *length, diff --git a/queue-4.14/series b/queue-4.14/series index 0af3e853281..f9c5a9cd435 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -66,3 +66,6 @@ revert-bridge-do-not-add-port-to-router-list-when-receives-query-with-source-0.0 netfilter-nf_tables-fix-flush-after-rule-deletion-in-the-same-batch.patch netfilter-nft_compat-use-after-free-when-deleting-targets.patch netfilter-ipv6-don-t-preserve-original-oif-for-loopback-address.patch +pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch +phy-tegra-remove-redundant-self-assignment-of-map.patch +sched-sysctl-fix-attributes-of-some-extern-declarations.patch