From 647594e020138c2b7ff37d00880e2edb096fcb17 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Feb 2014 08:21:42 -0800 Subject: [PATCH] 3.12-stable patches added patches: tile-remove-compat_sys_lookup_dcookie-declaration-to-fix-compile-error.patch --- queue-3.12/series | 2 +- ...kie-declaration-to-fix-compile-error.patch | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 queue-3.12/tile-remove-compat_sys_lookup_dcookie-declaration-to-fix-compile-error.patch diff --git a/queue-3.12/series b/queue-3.12/series index 3522def074e..12129aa0525 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -14,7 +14,6 @@ mm-memory-failure.c-shift-page-lock-from-head-page-to-tail-page-after-thp-split. mm-memcg-iteration-skip-memcgs-not-yet-fully-initialized.patch mm-page-writeback.c-fix-dirty_balance_reserve-subtraction-from-dirtyable-memory.patch mm-page-writeback.c-do-not-count-anon-pages-as-dirtyable-memory.patch -mm-munlock-fix-potential-race-with-thp-page-split.patch memcg-fix-endless-loop-caused-by-mem_cgroup_iter.patch memcg-fix-css-reference-leak-and-endless-loop-in-mem_cgroup_iter.patch mm-ignore-vm_softdirty-on-vma-merging.patch @@ -31,3 +30,4 @@ acpi-init-flag-use-of-acpi-and-acpi-idioms-for-power-supplies-to-regulator-api.p compat-fix-sys_fanotify_mark.patch fs-compat-fix-parameter-handling-for-compat-readv-writev-syscalls.patch fs-compat-fix-lookup_dcookie-parameter-handling.patch +tile-remove-compat_sys_lookup_dcookie-declaration-to-fix-compile-error.patch diff --git a/queue-3.12/tile-remove-compat_sys_lookup_dcookie-declaration-to-fix-compile-error.patch b/queue-3.12/tile-remove-compat_sys_lookup_dcookie-declaration-to-fix-compile-error.patch new file mode 100644 index 00000000000..0270116bd19 --- /dev/null +++ b/queue-3.12/tile-remove-compat_sys_lookup_dcookie-declaration-to-fix-compile-error.patch @@ -0,0 +1,46 @@ +From 5a5e75f4714a592f31e57f248b8f5c866f278b8d Mon Sep 17 00:00:00 2001 +From: Heiko Carstens +Date: Fri, 31 Jan 2014 07:50:36 +0100 +Subject: tile: remove compat_sys_lookup_dcookie declaration to fix compile error + +From: Heiko Carstens + +commit 5a5e75f4714a592f31e57f248b8f5c866f278b8d upstream. + +With commit d8d14bd09cdd ("fs/compat: fix lookup_dcookie() parameter +handling") I changed the type of the len parameter of the +lookup_dcookie() syscall. + +However I missed that there was still a stale declaration in +arch/tile/.. which now causes a compile error on tile: + + In file included from fs/dcookies.c:28:0: + include/linux/compat.h:425:17: error: conflicting types for 'compat_sys_lookup_dcookie' + fs/dcookies.c:207:1: error: conflicting types for 'compat_sys_lookup_dcookie' + +Simply remove the declaration in the tile architecture, which is only a +leftover from before the different compat lookup_dcookie() versions have +been merged. The correct declaration is now in include/linux/compat.h + +The build error was reported by Fenguang's build bot. + +Signed-off-by: Heiko Carstens +Acked-by: Chris Metcalf +Signed-off-by: Linus Torvalds +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + arch/tile/include/asm/compat.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/tile/include/asm/compat.h ++++ b/arch/tile/include/asm/compat.h +@@ -281,7 +281,6 @@ long compat_sys_pread64(unsigned int fd, + u32 dummy, u32 low, u32 high); + long compat_sys_pwrite64(unsigned int fd, char __user *ubuf, size_t count, + u32 dummy, u32 low, u32 high); +-long compat_sys_lookup_dcookie(u32 low, u32 high, char __user *buf, size_t len); + long compat_sys_sync_file_range2(int fd, unsigned int flags, + u32 offset_lo, u32 offset_hi, + u32 nbytes_lo, u32 nbytes_hi); -- 2.47.2