2014-01-31 06:50:43

by Heiko Carstens

[permalink] [raw]
Subject: [PATCH] tile: remove compat_sys_lookup_dcookie declaration to fix compile error

With 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 declaration is now in include/linux/compat.h

The build error was reported by Fenguang's build bot.

Signed-off-by: Heiko Carstens <[email protected]>
---
arch/tile/include/asm/compat.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h
index 78f1f2ded86c..ffd4493efc78 100644
--- 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, char __user *ubuf, size_t count,
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);
--
1.8.4.5


2014-01-31 16:01:26

by Chris Metcalf

[permalink] [raw]
Subject: Re: [PATCH] tile: remove compat_sys_lookup_dcookie declaration to fix compile error

On 1/31/2014 1:50 AM, Heiko Carstens wrote:
> With 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 declaration is now in include/linux/compat.h
>
> The build error was reported by Fenguang's build bot.
>
> Signed-off-by: Heiko Carstens <[email protected]>

Acked-by: Chris Metcalf <[email protected]>

--
Chris Metcalf, Tilera Corp.
http://www.tilera.com