]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Jan 2016 17:42:38 +0000 (09:42 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Jan 2016 17:42:38 +0000 (09:42 -0800)
added patches:
mn10300-select-config_have_uid16-to-fix-build-failure.patch

queue-4.1/mn10300-select-config_have_uid16-to-fix-build-failure.patch [new file with mode: 0644]
queue-4.1/series

diff --git a/queue-4.1/mn10300-select-config_have_uid16-to-fix-build-failure.patch b/queue-4.1/mn10300-select-config_have_uid16-to-fix-build-failure.patch
new file mode 100644 (file)
index 0000000..d310147
--- /dev/null
@@ -0,0 +1,51 @@
+From c86576ea114a9a881cf7328dc7181052070ca311 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Sat, 28 Nov 2015 08:52:04 -0800
+Subject: mn10300: Select CONFIG_HAVE_UID16 to fix build failure
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit c86576ea114a9a881cf7328dc7181052070ca311 upstream.
+
+mn10300 builds fail with
+
+fs/stat.c: In function 'cp_old_stat':
+fs/stat.c:163:2: error: 'old_uid_t' undeclared
+
+ipc/util.c: In function 'ipc64_perm_to_ipc_perm':
+ipc/util.c:540:2: error: 'old_uid_t' undeclared
+
+Select CONFIG_HAVE_UID16 and remove local definition of CONFIG_UID16
+to fix the problem.
+
+Fixes: fbc416ff8618 ("arm64: fix building without CONFIG_UID16")
+Cc: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Acked-by: David Howells <dhowells@redhat.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mn10300/Kconfig |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/arch/mn10300/Kconfig
++++ b/arch/mn10300/Kconfig
+@@ -1,6 +1,7 @@
+ config MN10300
+       def_bool y
+       select HAVE_OPROFILE
++      select HAVE_UID16
+       select GENERIC_IRQ_SHOW
+       select ARCH_WANT_IPC_PARSE_VERSION
+       select HAVE_ARCH_TRACEHOOK
+@@ -37,9 +38,6 @@ config HIGHMEM
+ config NUMA
+       def_bool n
+-config UID16
+-      def_bool y
+-
+ config RWSEM_GENERIC_SPINLOCK
+       def_bool y
index 0184f7f3ab45799b236139b2fa1e31e4fb68fd19..fdfee36dde638fe875aa1f05514bde30a68290b1 100644 (file)
@@ -123,3 +123,4 @@ staging-lustre-echo_copy.._lsm-dereferences-userland-pointers-directly.patch
 media-vivid-osd-fix-info-leak-in-ioctl.patch
 direct-io-fix-negative-return-from-dio-read-beyond-eof.patch
 fix-the-regression-from-direct-io-fix-negative-return-from-dio-read-beyond-eof.patch
+mn10300-select-config_have_uid16-to-fix-build-failure.patch