From 22b9e37cc48b720633b66dc5a477b999ac698c6c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 3 Jul 2018 11:18:13 +0200 Subject: [PATCH] drop 2 3.18 parisc patches --- ...isc-drivers.c-fix-section-mismatches.patch | 45 ------------------- ..._profiling_timer-out-of-init-section.patch | 32 ------------- queue-3.18/series | 2 - 3 files changed, 79 deletions(-) delete mode 100644 queue-3.18/parisc-drivers.c-fix-section-mismatches.patch delete mode 100644 queue-3.18/parisc-move-setup_profiling_timer-out-of-init-section.patch diff --git a/queue-3.18/parisc-drivers.c-fix-section-mismatches.patch b/queue-3.18/parisc-drivers.c-fix-section-mismatches.patch deleted file mode 100644 index eb141faa304..00000000000 --- a/queue-3.18/parisc-drivers.c-fix-section-mismatches.patch +++ /dev/null @@ -1,45 +0,0 @@ -From foo@baz Sun Jun 17 13:19:44 CEST 2018 -From: Helge Deller -Date: Fri, 20 Apr 2018 23:19:17 +0200 -Subject: parisc: drivers.c: Fix section mismatches - -From: Helge Deller - -[ Upstream commit b819439fea305a0bfd6ca23a7994fd1a8847c0d8 ] - -Fix two section mismatches in drivers.c: -1) Section mismatch in reference from the function alloc_tree_node() to - the function .init.text:create_tree_node(). -2) Section mismatch in reference from the function walk_native_bus() to - the function .init.text:alloc_pa_dev(). - -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/parisc/kernel/drivers.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - ---- a/arch/parisc/kernel/drivers.c -+++ b/arch/parisc/kernel/drivers.c -@@ -448,7 +448,8 @@ static int match_by_id(struct device * d - * Checks all the children of @parent for a matching @id. If none - * found, it allocates a new device and returns it. - */ --static struct parisc_device * alloc_tree_node(struct device *parent, char id) -+static struct parisc_device * __init alloc_tree_node( -+ struct device *parent, char id) - { - struct match_id_data d = { - .id = id, -@@ -822,8 +823,8 @@ void walk_lower_bus(struct parisc_device - * devices which are not physically connected (such as extra serial & - * keyboard ports). This problem is not yet solved. - */ --static void walk_native_bus(unsigned long io_io_low, unsigned long io_io_high, -- struct device *parent) -+static void __init walk_native_bus(unsigned long io_io_low, -+ unsigned long io_io_high, struct device *parent) - { - int i, devices_found = 0; - unsigned long hpa = io_io_low; diff --git a/queue-3.18/parisc-move-setup_profiling_timer-out-of-init-section.patch b/queue-3.18/parisc-move-setup_profiling_timer-out-of-init-section.patch deleted file mode 100644 index 6a75330a860..00000000000 --- a/queue-3.18/parisc-move-setup_profiling_timer-out-of-init-section.patch +++ /dev/null @@ -1,32 +0,0 @@ -From foo@baz Sun Jun 17 13:19:44 CEST 2018 -From: Helge Deller -Date: Fri, 18 May 2018 16:12:12 +0200 -Subject: parisc: Move setup_profiling_timer() out of init section - -From: Helge Deller - -[ Upstream commit 01f56832cfb6fcc204e7203f46841b6185ebd574 ] - -No other architecture has setup_profiling_timer() in the init section, -thus on parisc we face this section mismatch warning: - Reference from the function devm_device_add_group() to the function .init.text:setup_profiling_timer() - -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/parisc/kernel/smp.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/parisc/kernel/smp.c -+++ b/arch/parisc/kernel/smp.c -@@ -422,8 +422,7 @@ int __cpu_up(unsigned int cpu, struct ta - } - - #ifdef CONFIG_PROC_FS --int __init --setup_profiling_timer(unsigned int multiplier) -+int setup_profiling_timer(unsigned int multiplier) - { - return -EINVAL; - } diff --git a/queue-3.18/series b/queue-3.18/series index 94b1080c3b2..787c5a65bce 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -19,7 +19,6 @@ arm-davinci-board-dm355-evm-fix-broken-networking.patch hexagon-add-memset_io-helper.patch hexagon-export-csum_partial_copy_nocheck.patch scsi-vmw-pvscsi-return-did_bus_busy-for-adapter-initated-aborts.patch -parisc-drivers.c-fix-section-mismatches.patch kthread-sched-wait-fix-kthread_parkme-wait-loop.patch mac80211-adjust-sae-authentication-timeout.patch drm-omap-fix-possible-null-ref-issue-in-tiler_reserve_2d.patch @@ -32,7 +31,6 @@ i2c-pmcmsp-return-message-count-on-master_xfer-success.patch i2c-pmcmsp-fix-error-return-from-master_xfer.patch i2c-viperboard-return-message-count-on-master_xfer-success.patch arm-davinci-board-dm646x-evm-set-vpif-capture-card-name.patch -parisc-move-setup_profiling_timer-out-of-init-section.patch arm-8753-1-decompressor-add-a-missing-parameter-to-the-addruart-macro.patch tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch ext4-update-mtime-in-ext4_punch_hole-even-if-no-blocks-are-released.patch -- 2.47.3