From: Greg Kroah-Hartman Date: Thu, 8 Nov 2018 22:44:45 +0000 (-0800) Subject: drop arm-omap2-fix-n900-board-name-for-legacy-user-space.patch from 3.18 X-Git-Tag: v3.18.125~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95a28de582068446af23b1027ea25eb8e7411fc4;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-omap2-fix-n900-board-name-for-legacy-user-space.patch from 3.18 --- diff --git a/queue-3.18/arm-omap2-fix-n900-board-name-for-legacy-user-space.patch b/queue-3.18/arm-omap2-fix-n900-board-name-for-legacy-user-space.patch deleted file mode 100644 index a3948f84975..00000000000 --- a/queue-3.18/arm-omap2-fix-n900-board-name-for-legacy-user-space.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 31464eaadc47765e761f2ea27b6a059aee680019 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren -Date: Mon, 5 Jan 2015 15:45:45 -0800 -Subject: ARM: OMAP2+: Fix n900 board name for legacy user space -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ Upstream commit 71c4f6027da75c6c1fd92e05b63108a09ec2b109 ] - -N900 legacy user space apps need the board name in -/proc/cpuinfo to work properly for the Hardware entry. - -For other boards this should not be an issues and they -can use the generic Hardware entry. - -Let's fix the issue by adding a custom DT_MACHINE_START -for n900. - -Tested-by: Pali Rohár -Acked-by: Pavel Machek -Signed-off-by: Tony Lindgren -Signed-off-by: Sasha Levin ---- - arch/arm/mach-omap2/board-generic.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c -index 608079a1aba6..b61c049f92d6 100644 ---- a/arch/arm/mach-omap2/board-generic.c -+++ b/arch/arm/mach-omap2/board-generic.c -@@ -77,6 +77,24 @@ MACHINE_END - #endif - - #ifdef CONFIG_ARCH_OMAP3 -+/* Some boards need board name for legacy userspace in /proc/cpuinfo */ -+static const char *const n900_boards_compat[] __initconst = { -+ "nokia,omap3-n900", -+ NULL, -+}; -+ -+DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") -+ .reserve = omap_reserve, -+ .map_io = omap3_map_io, -+ .init_early = omap3430_init_early, -+ .init_machine = omap_generic_init, -+ .init_late = omap3_init_late, -+ .init_time = omap3_sync32k_timer_init, -+ .dt_compat = n900_boards_compat, -+ .restart = omap3xxx_restart, -+MACHINE_END -+ -+/* Generic omap3 boards, most boards can use these */ - static const char *const omap3_boards_compat[] __initconst = { - "ti,omap3430", - "ti,omap3", --- -2.17.1 - diff --git a/queue-3.18/series b/queue-3.18/series index bad5ab07732..6c70af7b1d9 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -50,7 +50,6 @@ phy-sun4i-usb-change-disconnect-threshold-value-for-.patch phy-phy-ti-pipe3-fix-inconsistent-enumeration-of-pci.patch iio-iio-fix-iio_channel_read-return-if-channel-havn-.patch arm-dra7xx-fix-counter-frequency-drift-for-am572x-er.patch -arm-omap2-fix-n900-board-name-for-legacy-user-space.patch nfsv4-cache-the-nfsv4-v4.1-client-owner_id-in-the-st.patch nfsv4-v4.1-verify-the-client-owner-id-during-trunkin.patch nfs-ignore-transport-protocol-when-detecting-server-.patch