From: Greg Kroah-Hartman Date: Wed, 27 Jan 2016 17:42:35 +0000 (-0800) Subject: 3.14-stable patches X-Git-Tag: v3.10.96~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=055617f93b22e46768219918ec9123f33fc27a20;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: mn10300-select-config_have_uid16-to-fix-build-failure.patch --- diff --git a/queue-3.14/mn10300-select-config_have_uid16-to-fix-build-failure.patch b/queue-3.14/mn10300-select-config_have_uid16-to-fix-build-failure.patch new file mode 100644 index 00000000000..d31014776c1 --- /dev/null +++ b/queue-3.14/mn10300-select-config_have_uid16-to-fix-build-failure.patch @@ -0,0 +1,51 @@ +From c86576ea114a9a881cf7328dc7181052070ca311 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Sat, 28 Nov 2015 08:52:04 -0800 +Subject: mn10300: Select CONFIG_HAVE_UID16 to fix build failure + +From: Guenter Roeck + +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 +Acked-by: Arnd Bergmann +Acked-by: Acked-by: David Howells +Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + 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 + diff --git a/queue-3.14/series b/queue-3.14/series index 361fe82125f..0d66c017415 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -55,3 +55,4 @@ arm64-mm-ensure-that-the-zero-page-is-visible-to-the-page-table-walker.patch parisc-iommu-fix-panic-due-to-trying-to-allocate-too-large-region.patch hid-core-avoid-uninitialized-buffer-access.patch openrisc-fix-config_uid16-setting.patch +mn10300-select-config_have_uid16-to-fix-build-failure.patch