]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop tracing-handle-cc_flags_ftrace-more-accurately.patch from everywhere.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Sep 2018 18:24:00 +0000 (20:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Sep 2018 18:24:00 +0000 (20:24 +0200)
queue-4.14/series
queue-4.14/tracing-handle-cc_flags_ftrace-more-accurately.patch [deleted file]
queue-4.18/drm-i915-glk-add-quirk-for-glk-nuc-hdmi-port-issues.patch [deleted file]
queue-4.18/series
queue-4.18/tracing-handle-cc_flags_ftrace-more-accurately.patch [deleted file]
queue-4.4/series
queue-4.4/tracing-handle-cc_flags_ftrace-more-accurately.patch [deleted file]
queue-4.9/series
queue-4.9/tracing-handle-cc_flags_ftrace-more-accurately.patch [deleted file]

index e4aee68b26ea914f278a722bcd4d92e99376fe69..fc0ddf2a22705728b98c6ab55c2336914dd530d2 100644 (file)
@@ -39,7 +39,6 @@ netfilter-ip6t_rpfilter-set-f_iface-for-linklocal-addresses.patch
 s390-kdump-fix-memleak-in-nt_vmcoreinfo.patch
 ipvs-fix-race-between-ip_vs_conn_new-and-ip_vs_del_dest.patch
 mfd-sm501-set-coherent_dma_mask-when-creating-subdevices.patch
-tracing-handle-cc_flags_ftrace-more-accurately.patch
 platform-x86-asus-nb-wmi-add-keymap-entry-for-lid-flip-action-on-ux360.patch
 netfilter-fix-memory-leaks-on-netlink_dump_start-error.patch
 tcp-ulp-add-alias-for-all-ulp-modules.patch
diff --git a/queue-4.14/tracing-handle-cc_flags_ftrace-more-accurately.patch b/queue-4.14/tracing-handle-cc_flags_ftrace-more-accurately.patch
deleted file mode 100644 (file)
index 9c23c99..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From foo@baz Tue Sep 11 12:07:47 CEST 2018
-From: Vasily Gorbik <gor@linux.ibm.com>
-Date: Mon, 6 Aug 2018 15:17:42 +0200
-Subject: tracing: Handle CC_FLAGS_FTRACE more accurately
-
-From: Vasily Gorbik <gor@linux.ibm.com>
-
-[ Upstream commit f28bc3c32c059ab4d13f52155fabd3e20f477f65 ]
-
-CC_FLAGS_FTRACE is exported and later used to remove ftrace relevant
-build flags from files which should be built without ftrace support.
-For that reason add -mfentry to CC_FLAGS_FTRACE as well. That fixes
-a problem with vdso32 build on s390, where -mfentry could not be used
-together with -m31 flag.
-
-At the same time flags like -pg and -mfentry are not relevant for asm
-files, so avoid adding them to KBUILD_AFLAGS.
-
-Introduce CC_FLAGS_USING instead of CC_USING_FENTRY to collect
--DCC_USING_FENTRY (and future alike) which are relevant for both
-KBUILD_CFLAGS and KBUILD_AFLAGS.
-
-Link: http://lkml.kernel.org/r/patch-1.thread-aa7b8d.git-42971afe87de.your-ad-here.call-01533557518-ext-9465@work.hours
-
-Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Makefile |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -767,12 +767,15 @@ ifdef CONFIG_FUNCTION_TRACER
- ifndef CC_FLAGS_FTRACE
- CC_FLAGS_FTRACE := -pg
- endif
--export CC_FLAGS_FTRACE
- ifdef CONFIG_HAVE_FENTRY
--CC_USING_FENTRY       := $(call cc-option, -mfentry -DCC_USING_FENTRY)
-+  ifeq ($(call cc-option-yn, -mfentry),y)
-+    CC_FLAGS_FTRACE   += -mfentry
-+    CC_FLAGS_USING    += -DCC_USING_FENTRY
-+  endif
- endif
--KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_USING_FENTRY)
--KBUILD_AFLAGS += $(CC_USING_FENTRY)
-+export CC_FLAGS_FTRACE
-+KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING)
-+KBUILD_AFLAGS += $(CC_FLAGS_USING)
- ifdef CONFIG_DYNAMIC_FTRACE
-       ifdef CONFIG_HAVE_C_RECORDMCOUNT
-               BUILD_C_RECORDMCOUNT := y
diff --git a/queue-4.18/drm-i915-glk-add-quirk-for-glk-nuc-hdmi-port-issues.patch b/queue-4.18/drm-i915-glk-add-quirk-for-glk-nuc-hdmi-port-issues.patch
deleted file mode 100644 (file)
index d5e4209..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-From 90c3e2198777aaa355b6994a31a79c636c8d4306 Mon Sep 17 00:00:00 2001
-From: Clint Taylor <clinton.a.taylor@intel.com>
-Date: Tue, 10 Jul 2018 13:02:05 -0700
-Subject: drm/i915/glk: Add Quirk for GLK NUC HDMI port issues.
-
-From: Clint Taylor <clinton.a.taylor@intel.com>
-
-commit 90c3e2198777aaa355b6994a31a79c636c8d4306 upstream.
-
-On GLK NUC platforms the HDMI retiming buffer needs additional disabled
-time to correctly sync to a faster incoming signal.
-
-When measured on a scope the highspeed lines of the HDMI clock turn off
- for ~400uS during a normal resolution change. The HDMI retimer on the
- GLK NUC appears to require at least a full frame of quiet time before a
-new faster clock can be correctly sync'd. Wait 100ms due to msleep
-inaccuracies while waiting for a completed frame. Add a quirk to the
-driver for GLK boards that use ITE66317 HDMI retimers.
-
-V2: Add more devices to the quirk list
-V3: Delay increased to 100ms, check to confirm crtc type is HDMI.
-V4: crtc type check extended to include _DDI and whitespace fixes
-v5: Fix white spaces, remove the macro for delay. Revert the crtc type
-    check introduced in v4.
-
-Cc: Imre Deak <imre.deak@intel.com>
-Cc: <stable@vger.kernel.org> # v4.14+
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105887
-Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
-Tested-by: Daniel Scheller <d.scheller.oss@gmail.com>
-Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
-Signed-off-by: Imre Deak <imre.deak@intel.com>
-Reviewed-by: Imre Deak <imre.deak@intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20180710200205.1478-1-radhakrishna.sripada@intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 1616e994b9a5..f519485fcd73 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -650,6 +650,7 @@ enum intel_sbi_destination {
- #define QUIRK_BACKLIGHT_PRESENT (1<<3)
- #define QUIRK_PIN_SWIZZLED_PAGES (1<<5)
- #define QUIRK_INCREASE_T12_DELAY (1<<6)
-+#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)
- struct intel_fbdev;
- struct intel_fbc_work;
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 32838ed89ee7..e4caa902d88e 100644
---- a/drivers/gpu/drm/i915/intel_ddi.c
-+++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -1808,15 +1808,24 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
-       I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);
- }
--void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
--                                     enum transcoder cpu_transcoder)
-+void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state)
- {
-+      struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
-+      struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-+      enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
-       i915_reg_t reg = TRANS_DDI_FUNC_CTL(cpu_transcoder);
-       uint32_t val = I915_READ(reg);
-       val &= ~(TRANS_DDI_FUNC_ENABLE | TRANS_DDI_PORT_MASK | TRANS_DDI_DP_VC_PAYLOAD_ALLOC);
-       val |= TRANS_DDI_PORT_NONE;
-       I915_WRITE(reg, val);
-+
-+      if (dev_priv->quirks & QUIRK_INCREASE_DDI_DISABLED_TIME &&
-+          intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
-+              DRM_DEBUG_KMS("Quirk Increase DDI disabled time\n");
-+              /* Quirk time at 100ms for reliable operation */
-+              msleep(100);
-+      }
- }
- int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 694975afe394..8bd9080fce34 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -5838,7 +5838,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
-               intel_ddi_set_vc_payload_alloc(old_crtc_state, false);
-       if (!transcoder_is_dsi(cpu_transcoder))
--              intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
-+              intel_ddi_disable_transcoder_func(old_crtc_state);
-       if (INTEL_GEN(dev_priv) >= 9)
-               skylake_scaler_disable(intel_crtc);
-@@ -14806,6 +14806,18 @@ static void quirk_increase_t12_delay(struct drm_device *dev)
-       DRM_INFO("Applying T12 delay quirk\n");
- }
-+/*
-+ * GeminiLake NUC HDMI outputs require additional off time
-+ * this allows the onboard retimer to correctly sync to signal
-+ */
-+static void quirk_increase_ddi_disabled_time(struct drm_device *dev)
-+{
-+      struct drm_i915_private *dev_priv = to_i915(dev);
-+
-+      dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME;
-+      DRM_INFO("Applying Increase DDI Disabled quirk\n");
-+}
-+
- struct intel_quirk {
-       int device;
-       int subsystem_vendor;
-@@ -14892,6 +14904,13 @@ static struct intel_quirk intel_quirks[] = {
-       /* Toshiba Satellite P50-C-18C */
-       { 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay },
-+
-+      /* GeminiLake NUC */
-+      { 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
-+      { 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
-+      /* ASRock ITX*/
-+      { 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
-+      { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
- };
- static void intel_init_quirks(struct drm_device *dev)
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index 1375cad8bf83..a0e9a35b5658 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -1384,8 +1384,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc,
- void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port);
- bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);
- void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state);
--void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
--                                     enum transcoder cpu_transcoder);
-+void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state);
- void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state);
- void intel_ddi_disable_pipe_clock(const  struct intel_crtc_state *crtc_state);
- void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state);
index a8188baa0ccaf383b58bf322b69044a4d93e9c51..6b26f911e91c17918f8de73ccaba11610f7541fb 100644 (file)
@@ -72,7 +72,6 @@ s390-kdump-fix-memleak-in-nt_vmcoreinfo.patch
 ipvs-fix-race-between-ip_vs_conn_new-and-ip_vs_del_dest.patch
 mfd-sm501-set-coherent_dma_mask-when-creating-subdevices.patch
 netfilter-x_tables-do-not-fail-xt_alloc_table_info-too-easilly.patch
-tracing-handle-cc_flags_ftrace-more-accurately.patch
 platform-x86-asus-nb-wmi-add-keymap-entry-for-lid-flip-action-on-ux360.patch
 netfilter-fix-memory-leaks-on-netlink_dump_start-error.patch
 tcp-ulp-add-alias-for-all-ulp-modules.patch
@@ -183,4 +182,3 @@ drm-amdgpu-fix-incorrect-use-of-drm_file-pid.patch
 drm-i915-re-apply-perform-link-quality-check-unconditionally-during-long-pulse.patch
 uapi-linux-keyctl.h-don-t-use-c-reserved-keyword-as-a-struct-member-name.patch
 mm-respect-arch_dup_mmap-return-value.patch
-drm-i915-glk-add-quirk-for-glk-nuc-hdmi-port-issues.patch
diff --git a/queue-4.18/tracing-handle-cc_flags_ftrace-more-accurately.patch b/queue-4.18/tracing-handle-cc_flags_ftrace-more-accurately.patch
deleted file mode 100644 (file)
index 2f02ef5..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From foo@baz Tue Sep 11 12:05:55 CEST 2018
-From: Vasily Gorbik <gor@linux.ibm.com>
-Date: Mon, 6 Aug 2018 15:17:42 +0200
-Subject: tracing: Handle CC_FLAGS_FTRACE more accurately
-
-From: Vasily Gorbik <gor@linux.ibm.com>
-
-[ Upstream commit f28bc3c32c059ab4d13f52155fabd3e20f477f65 ]
-
-CC_FLAGS_FTRACE is exported and later used to remove ftrace relevant
-build flags from files which should be built without ftrace support.
-For that reason add -mfentry to CC_FLAGS_FTRACE as well. That fixes
-a problem with vdso32 build on s390, where -mfentry could not be used
-together with -m31 flag.
-
-At the same time flags like -pg and -mfentry are not relevant for asm
-files, so avoid adding them to KBUILD_AFLAGS.
-
-Introduce CC_FLAGS_USING instead of CC_USING_FENTRY to collect
--DCC_USING_FENTRY (and future alike) which are relevant for both
-KBUILD_CFLAGS and KBUILD_AFLAGS.
-
-Link: http://lkml.kernel.org/r/patch-1.thread-aa7b8d.git-42971afe87de.your-ad-here.call-01533557518-ext-9465@work.hours
-
-Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Makefile |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -747,12 +747,15 @@ ifdef CONFIG_FUNCTION_TRACER
- ifndef CC_FLAGS_FTRACE
- CC_FLAGS_FTRACE := -pg
- endif
--export CC_FLAGS_FTRACE
- ifdef CONFIG_HAVE_FENTRY
--CC_USING_FENTRY       := $(call cc-option, -mfentry -DCC_USING_FENTRY)
-+  ifeq ($(call cc-option-yn, -mfentry),y)
-+    CC_FLAGS_FTRACE   += -mfentry
-+    CC_FLAGS_USING    += -DCC_USING_FENTRY
-+  endif
- endif
--KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_USING_FENTRY)
--KBUILD_AFLAGS += $(CC_USING_FENTRY)
-+export CC_FLAGS_FTRACE
-+KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING)
-+KBUILD_AFLAGS += $(CC_FLAGS_USING)
- ifdef CONFIG_DYNAMIC_FTRACE
-       ifdef CONFIG_HAVE_C_RECORDMCOUNT
-               BUILD_C_RECORDMCOUNT := y
index 77685335424fa5590bb4592e58ed4bb010b077a7..ca0a039b6ac7162187bcd766cb9c3ac555ec3d6a 100644 (file)
@@ -16,7 +16,6 @@ mm-fadvise.c-fix-signed-overflow-ubsan-complaint.patch
 fs-dcache.c-fix-kmemcheck-splat-at-take_dentry_name_snapshot.patch
 ipvs-fix-race-between-ip_vs_conn_new-and-ip_vs_del_dest.patch
 mfd-sm501-set-coherent_dma_mask-when-creating-subdevices.patch
-tracing-handle-cc_flags_ftrace-more-accurately.patch
 platform-x86-asus-nb-wmi-add-keymap-entry-for-lid-flip-action-on-ux360.patch
 irqchip-bcm7038-l1-hide-cpu-offline-callback-when-building-for-smp.patch
 net-9p-fix-error-path-of-p9_virtio_probe.patch
diff --git a/queue-4.4/tracing-handle-cc_flags_ftrace-more-accurately.patch b/queue-4.4/tracing-handle-cc_flags_ftrace-more-accurately.patch
deleted file mode 100644 (file)
index e66d7b4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From foo@baz Tue Sep 11 12:11:08 CEST 2018
-From: Vasily Gorbik <gor@linux.ibm.com>
-Date: Mon, 6 Aug 2018 15:17:42 +0200
-Subject: tracing: Handle CC_FLAGS_FTRACE more accurately
-
-From: Vasily Gorbik <gor@linux.ibm.com>
-
-[ Upstream commit f28bc3c32c059ab4d13f52155fabd3e20f477f65 ]
-
-CC_FLAGS_FTRACE is exported and later used to remove ftrace relevant
-build flags from files which should be built without ftrace support.
-For that reason add -mfentry to CC_FLAGS_FTRACE as well. That fixes
-a problem with vdso32 build on s390, where -mfentry could not be used
-together with -m31 flag.
-
-At the same time flags like -pg and -mfentry are not relevant for asm
-files, so avoid adding them to KBUILD_AFLAGS.
-
-Introduce CC_FLAGS_USING instead of CC_USING_FENTRY to collect
--DCC_USING_FENTRY (and future alike) which are relevant for both
-KBUILD_CFLAGS and KBUILD_AFLAGS.
-
-Link: http://lkml.kernel.org/r/patch-1.thread-aa7b8d.git-42971afe87de.your-ad-here.call-01533557518-ext-9465@work.hours
-
-Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Makefile |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -754,12 +754,15 @@ ifdef CONFIG_FUNCTION_TRACER
- ifndef CC_FLAGS_FTRACE
- CC_FLAGS_FTRACE := -pg
- endif
--export CC_FLAGS_FTRACE
- ifdef CONFIG_HAVE_FENTRY
--CC_USING_FENTRY       := $(call cc-option, -mfentry -DCC_USING_FENTRY)
-+  ifeq ($(call cc-option-yn, -mfentry),y)
-+    CC_FLAGS_FTRACE   += -mfentry
-+    CC_FLAGS_USING    += -DCC_USING_FENTRY
-+  endif
- endif
--KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_USING_FENTRY)
--KBUILD_AFLAGS += $(CC_USING_FENTRY)
-+export CC_FLAGS_FTRACE
-+KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING)
-+KBUILD_AFLAGS += $(CC_FLAGS_USING)
- ifdef CONFIG_DYNAMIC_FTRACE
-       ifdef CONFIG_HAVE_C_RECORDMCOUNT
-               BUILD_C_RECORDMCOUNT := y
index 64d13d77bac9b661a7b53fcadb3f02f849f8f9d2..8c1398d348906f1afd253201306aa2f90b6fa4f5 100644 (file)
@@ -29,7 +29,6 @@ platform-x86-intel_punit_ipc-fix-build-errors.patch
 s390-kdump-fix-memleak-in-nt_vmcoreinfo.patch
 ipvs-fix-race-between-ip_vs_conn_new-and-ip_vs_del_dest.patch
 mfd-sm501-set-coherent_dma_mask-when-creating-subdevices.patch
-tracing-handle-cc_flags_ftrace-more-accurately.patch
 platform-x86-asus-nb-wmi-add-keymap-entry-for-lid-flip-action-on-ux360.patch
 rdma-hns-fix-usage-of-bitmap-allocation-functions-return-values.patch
 irqchip-bcm7038-l1-hide-cpu-offline-callback-when-building-for-smp.patch
diff --git a/queue-4.9/tracing-handle-cc_flags_ftrace-more-accurately.patch b/queue-4.9/tracing-handle-cc_flags_ftrace-more-accurately.patch
deleted file mode 100644 (file)
index 74fe031..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From foo@baz Tue Sep 11 12:09:55 CEST 2018
-From: Vasily Gorbik <gor@linux.ibm.com>
-Date: Mon, 6 Aug 2018 15:17:42 +0200
-Subject: tracing: Handle CC_FLAGS_FTRACE more accurately
-
-From: Vasily Gorbik <gor@linux.ibm.com>
-
-[ Upstream commit f28bc3c32c059ab4d13f52155fabd3e20f477f65 ]
-
-CC_FLAGS_FTRACE is exported and later used to remove ftrace relevant
-build flags from files which should be built without ftrace support.
-For that reason add -mfentry to CC_FLAGS_FTRACE as well. That fixes
-a problem with vdso32 build on s390, where -mfentry could not be used
-together with -m31 flag.
-
-At the same time flags like -pg and -mfentry are not relevant for asm
-files, so avoid adding them to KBUILD_AFLAGS.
-
-Introduce CC_FLAGS_USING instead of CC_USING_FENTRY to collect
--DCC_USING_FENTRY (and future alike) which are relevant for both
-KBUILD_CFLAGS and KBUILD_AFLAGS.
-
-Link: http://lkml.kernel.org/r/patch-1.thread-aa7b8d.git-42971afe87de.your-ad-here.call-01533557518-ext-9465@work.hours
-
-Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Makefile |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -760,12 +760,15 @@ ifdef CONFIG_FUNCTION_TRACER
- ifndef CC_FLAGS_FTRACE
- CC_FLAGS_FTRACE := -pg
- endif
--export CC_FLAGS_FTRACE
- ifdef CONFIG_HAVE_FENTRY
--CC_USING_FENTRY       := $(call cc-option, -mfentry -DCC_USING_FENTRY)
-+  ifeq ($(call cc-option-yn, -mfentry),y)
-+    CC_FLAGS_FTRACE   += -mfentry
-+    CC_FLAGS_USING    += -DCC_USING_FENTRY
-+  endif
- endif
--KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_USING_FENTRY)
--KBUILD_AFLAGS += $(CC_USING_FENTRY)
-+export CC_FLAGS_FTRACE
-+KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING)
-+KBUILD_AFLAGS += $(CC_FLAGS_USING)
- ifdef CONFIG_DYNAMIC_FTRACE
-       ifdef CONFIG_HAVE_C_RECORDMCOUNT
-               BUILD_C_RECORDMCOUNT := y