From 66a40ff795a0f5135f97b7e4fc939d5e5fc05f96 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 3 Nov 2018 11:02:05 -0400 Subject: [PATCH] remove 2 patches to fix build on 3.18 Signed-off-by: Sasha Levin --- ...7-fix-hyp-mode-boot-for-thumb2-build.patch | 42 --------------- ...os_mct-clear-interrupt-when-cpu-is-s.patch | 52 ------------------- queue-3.18/series | 2 - 3 files changed, 96 deletions(-) delete mode 100644 queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch delete mode 100644 queue-3.18/clocksource-exynos_mct-clear-interrupt-when-cpu-is-s.patch diff --git a/queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch b/queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch deleted file mode 100644 index 1dbb2f582e9..00000000000 --- a/queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 118f841a3b8b33fd0502334494197737cec5d51b Mon Sep 17 00:00:00 2001 -From: Matthijs van Duin -Date: Thu, 16 Feb 2017 01:05:04 +0100 -Subject: ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build - -[ Upstream commit 448c077eeb02240c430db2a2c3bf5285a4c65d66 ] - -'adr' yields a data-pointer, not a function-pointer. - -Fixes: 999f934de195 ("ARM: omap5/dra7xx: Enable booting secondary -CPU in HYP mode") -Signed-off-by: Matthijs van Duin -Signed-off-by: Tony Lindgren -Signed-off-by: Sasha Levin ---- - arch/arm/mach-omap2/omap-headsmp.S | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S -index 6d1dffca6c7b..748dde9fa4a5 100644 ---- a/arch/arm/mach-omap2/omap-headsmp.S -+++ b/arch/arm/mach-omap2/omap-headsmp.S -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - #include "omap44xx.h" - -@@ -56,7 +57,7 @@ wait_2: ldr r2, =AUX_CORE_BOOT0_PA @ read from AuxCoreBoot0 - cmp r0, r4 - bne wait_2 - ldr r12, =API_HYP_ENTRY -- adr r0, hyp_boot -+ badr r0, hyp_boot - smc #0 - hyp_boot: - b secondary_startup --- -2.17.1 - diff --git a/queue-3.18/clocksource-exynos_mct-clear-interrupt-when-cpu-is-s.patch b/queue-3.18/clocksource-exynos_mct-clear-interrupt-when-cpu-is-s.patch deleted file mode 100644 index c586b1cb238..00000000000 --- a/queue-3.18/clocksource-exynos_mct-clear-interrupt-when-cpu-is-s.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a5403bf1921b79e042818af726b428d44b6477c2 Mon Sep 17 00:00:00 2001 -From: Joonyoung Shim -Date: Tue, 17 Jan 2017 13:54:36 +0900 -Subject: clocksource/exynos_mct: Clear interrupt when cpu is shut down - -[ Upstream commit bc7c36eedb0c7004aa06c2afc3c5385adada8fa3 ] - -When a CPU goes offline a potentially pending timer interrupt is not -cleared. When the CPU comes online again then the pending interrupt is -delivered before the per cpu clockevent device is initialized. As a -consequence the tick interrupt handler dereferences a NULL pointer. - -[ 51.251378] Unable to handle kernel NULL pointer dereference at virtual address 00000040 -[ 51.289348] task: ee942d00 task.stack: ee960000 -[ 51.293861] PC is at tick_periodic+0x38/0xb0 -[ 51.298102] LR is at tick_handle_periodic+0x1c/0x90 - -Clear the pending interrupt in the cpu dying path. - -Fixes: 56a94f13919c ("clocksource: exynos_mct: Avoid blocking calls in the cpu hotplug notifier") -Reported-by: Seung-Woo Kim -Signed-off-by: Joonyoung Shim -Cc: linux-samsung-soc@vger.kernel.org -Cc: cw00.choi@samsung.com -Cc: daniel.lezcano@linaro.org -Cc: stable@vger.kernel.org -Cc: javier@osg.samsung.com -Cc: kgene@kernel.org -Cc: krzk@kernel.org -Cc: linux-arm-kernel@lists.infradead.org -Link: http://lkml.kernel.org/r/1484628876-22065-1-git-send-email-jy0922.shim@samsung.com -Signed-off-by: Thomas Gleixner -Signed-off-by: Sasha Levin ---- - drivers/clocksource/exynos_mct.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c -index c844616028d2..714f9a767b17 100644 ---- a/drivers/clocksource/exynos_mct.c -+++ b/drivers/clocksource/exynos_mct.c -@@ -487,6 +487,7 @@ static void exynos4_local_timer_stop(struct clock_event_device *evt) - if (mct_int_type == MCT_INT_SPI) { - if (evt->irq != -1) - disable_irq_nosync(evt->irq); -+ exynos4_mct_write(0x1, mevt->base + MCT_L_INT_CSTAT_OFFSET); - } else { - disable_percpu_irq(mct_irqs[MCT_L0_IRQ]); - } --- -2.17.1 - diff --git a/queue-3.18/series b/queue-3.18/series index e354b079990..52ef85c6a96 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -36,7 +36,6 @@ usb-qcserial-fix-support-for-hp-lt4112-lte-hspa-gobi.patch cxl-fix-issues-when-unmapping-contexts.patch s390-ftrace-jprobes-fix-conflict-between-jprobes-and.patch mmc-sdhci-restore-behavior-when-setting-vdd-via-exte.patch -arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch usb-gadget-gadgetfs-fix-an-oops-in-ep_write.patch ahci_xgene-fix-the-dma-state-machine-lockup-for-the-.patch revert-drm-i915-fix-mutex-owner-inspection-race-unde.patch @@ -104,7 +103,6 @@ mtd-blkdevs-fix-potential-deadlock-lockdep-warnings.patch selftests-introduce-a-new-script-to-generate-tc-batc.patch rtlwifi-rtl8821ae-fix-system-lockups-on-boot.patch rtlwifi-rtl8821ae-fix-lockups-on-boot.patch -clocksource-exynos_mct-clear-interrupt-when-cpu-is-s.patch alsa-hda-add-headset-mic-support-for-acer-aspire-v5-.patch alsa-usb-audio-add-a-more-accurate-volume-quirk-for-.patch tty-audit-fix-audit-source.patch -- 2.47.2