From: Greg Kroah-Hartman Date: Wed, 14 Nov 2018 17:57:40 +0000 (-0800) Subject: drop 2 4.4 patches that were causing build errors X-Git-Tag: v4.19.3~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35eca7e80d3af86b7f7c3b5cf4cc9120c60f7746;p=thirdparty%2Fkernel%2Fstable-queue.git drop 2 4.4 patches that were causing build errors --- diff --git a/queue-4.4/series b/queue-4.4/series index 6a5e56ce9e4..538d1c33ae1 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -10,7 +10,6 @@ alsa-ca0106-disable-izd-on-sb0570-dac-to-fix-audio-pops.patch x86-corruption-check-fix-panic-in-memory_corruption_check-when-boot-option-without-value-is-provided.patch x86-kconfig-fall-back-to-ticket-spinlocks.patch sparc-fix-single-pcr-perf-event-counter-management.patch -sparc-throttle-perf-events-properly.patch x86-fpu-remove-second-definition-of-fpu-in-__fpu__restore_sig.patch net-qla3xxx-remove-overflowing-shift-statement.patch selftests-ftrace-add-synthetic-event-syntax-testcase.patch @@ -21,7 +20,6 @@ tun-consistently-configure-generic-netdev-params-via-rtnetlink.patch perf-tools-free-temporary-sys-string-in-read_event_files.patch perf-tools-cleanup-trace-event-info-tdata-leak.patch mmc-sdhci-pci-o2micro-add-quirk-for-o2-micro-dev-0x8620-rev-0x01.patch -x86-olpc-indicate-that-legacy-pc-xo-1-platform-should-not-register-rtc.patch bluetooth-btbcm-add-entry-for-bcm4335c0-uart-bluetooth.patch x86-boot-fix-efi-stub-alignment.patch pinctrl-qcom-spmi-mpp-fix-err-handling-of-pmic_mpp_set_mux.patch diff --git a/queue-4.4/sparc-throttle-perf-events-properly.patch b/queue-4.4/sparc-throttle-perf-events-properly.patch deleted file mode 100644 index fbd32d80201..00000000000 --- a/queue-4.4/sparc-throttle-perf-events-properly.patch +++ /dev/null @@ -1,58 +0,0 @@ -From foo@baz Sat Nov 10 11:34:22 PST 2018 -From: "David S. Miller" -Date: Fri, 12 Oct 2018 10:33:20 -0700 -Subject: sparc: Throttle perf events properly. - -From: "David S. Miller" - -[ Upstream commit 455adb3174d2c8518cef1a61140c211f6ac224d2 ] - -Like x86 and arm, call perf_sample_event_took() in perf event -NMI interrupt handler. - -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/sparc/kernel/perf_event.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/arch/sparc/kernel/perf_event.c -+++ b/arch/sparc/kernel/perf_event.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1611,6 +1612,8 @@ static int __kprobes perf_event_nmi_hand - struct perf_sample_data data; - struct cpu_hw_events *cpuc; - struct pt_regs *regs; -+ u64 finish_clock; -+ u64 start_clock; - int i; - - if (!atomic_read(&active_events)) -@@ -1624,6 +1627,8 @@ static int __kprobes perf_event_nmi_hand - return NOTIFY_DONE; - } - -+ start_clock = sched_clock(); -+ - regs = args->regs; - - cpuc = this_cpu_ptr(&cpu_hw_events); -@@ -1662,6 +1667,10 @@ static int __kprobes perf_event_nmi_hand - sparc_pmu_stop(event, 0); - } - -+ finish_clock = sched_clock(); -+ -+ perf_sample_event_took(finish_clock - start_clock); -+ - return NOTIFY_STOP; - } - diff --git a/queue-4.4/x86-olpc-indicate-that-legacy-pc-xo-1-platform-should-not-register-rtc.patch b/queue-4.4/x86-olpc-indicate-that-legacy-pc-xo-1-platform-should-not-register-rtc.patch deleted file mode 100644 index 8290e1413c0..00000000000 --- a/queue-4.4/x86-olpc-indicate-that-legacy-pc-xo-1-platform-should-not-register-rtc.patch +++ /dev/null @@ -1,71 +0,0 @@ -From foo@baz Sat Nov 10 11:34:22 PST 2018 -From: Lubomir Rintel -Date: Thu, 4 Oct 2018 18:08:08 +0200 -Subject: x86/olpc: Indicate that legacy PC XO-1 platform should not register RTC - -From: Lubomir Rintel - -[ Upstream commit d92116b800fb79a72ad26121f5011f6aa3ad94c2 ] - -On OLPC XO-1, the RTC is discovered via device tree from the arch -initcall. Don't let the PC platform register another one from its device -initcall, it's not going to work: - - sysfs: cannot create duplicate filename '/devices/platform/rtc_cmos' - CPU: 0 PID: 1 Comm: swapper Not tainted 4.19.0-rc6 #12 - Hardware name: OLPC XO/XO, BIOS OLPC Ver 1.00.01 06/11/2014 - Call Trace: - dump_stack+0x16/0x18 - sysfs_warn_dup+0x46/0x58 - sysfs_create_dir_ns+0x76/0x9b - kobject_add_internal+0xed/0x209 - ? __schedule+0x3fa/0x447 - kobject_add+0x5b/0x66 - device_add+0x298/0x535 - ? insert_resource_conflict+0x2a/0x3e - platform_device_add+0x14d/0x192 - ? io_delay_init+0x19/0x19 - platform_device_register+0x1c/0x1f - add_rtc_cmos+0x16/0x31 - do_one_initcall+0x78/0x14a - ? do_early_param+0x75/0x75 - kernel_init_freeable+0x152/0x1e0 - ? rest_init+0xa2/0xa2 - kernel_init+0x8/0xd5 - ret_from_fork+0x2e/0x38 - kobject_add_internal failed for rtc_cmos with -EEXIST, don't try to - register things with the same name in the same directory. - platform rtc_cmos: registered platform RTC device (no PNP device found) - -Signed-off-by: Lubomir Rintel -Signed-off-by: Borislav Petkov -Acked-by: Thomas Gleixner -CC: "H. Peter Anvin" -CC: Ingo Molnar -CC: x86-ml -Link: http://lkml.kernel.org/r/20181004160808.307738-1-lkundrak@v3.sk -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/x86/platform/olpc/olpc-xo1-rtc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/arch/x86/platform/olpc/olpc-xo1-rtc.c -+++ b/arch/x86/platform/olpc/olpc-xo1-rtc.c -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - static void rtc_wake_on(struct device *dev) - { -@@ -75,6 +76,8 @@ static int __init xo1_rtc_init(void) - if (r) - return r; - -+ x86_platform.legacy.rtc = 0; -+ - device_init_wakeup(&xo1_rtc_device.dev, 1); - return 0; - }