2008-08-22 15:21:14

by Adrian Bunk

Subject: [2.6 patch] sh64: re-add the __strnlen_user() prototype

Commit 42fd3b142d8867f5b58d6fb75592cd20fd654c1b
(sh: Initial consolidation of the _32/_64 uaccess split.)
mistakenly removed the sh64 __strnlen_user() prototype,
resulting in the following compile error:

<-- snip -->

...
CC init/main.o
In file included from include/linux/poll.h:13,
from include/linux/rtc.h:113,
from include/linux/efi.h:19,
from init/main.c:43:
arch/sh/include/asm/uaccess.h: In function 'strnlen_user':
arch/sh/include/asm/uaccess.h:213: error: implicit declaration of function '__strnlen_user'
...
make[2]: *** [init/main.o] Error 1

<-- snip -->

Reported-by: Adrian Bunk <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

---
5f4815210f1a81795eb911141bd24feb2bac8521
diff --git a/arch/sh/include/asm/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h
index 81b3d51..5580fd4 100644
--- a/arch/sh/include/asm/uaccess_64.h
+++ b/arch/sh/include/asm/uaccess_64.h
@@ -76,4 +76,6 @@ extern long __put_user_asm_l(void *, long);
extern long __put_user_asm_q(void *, long);
extern void __put_user_unknown(void);

+extern long __strnlen_user(const char *__s, long __n);
+
#endif /* __ASM_SH_UACCESS_64_H */

2008-08-25 06:27:55

by Paul Mundt

Subject: Re: [2.6 patch] sh64: re-add the __strnlen_user() prototype

On Fri, Aug 22, 2008 at 06:20:29PM +0300, Adrian Bunk wrote:
> Commit 42fd3b142d8867f5b58d6fb75592cd20fd654c1b
> (sh: Initial consolidation of the _32/_64 uaccess split.)
> mistakenly removed the sh64 __strnlen_user() prototype,
> resulting in the following compile error:
>
> <-- snip -->
>
> ...
> CC init/main.o
> In file included from include/linux/poll.h:13,
> from include/linux/rtc.h:113,
> from include/linux/efi.h:19,
> from init/main.c:43:
> arch/sh/include/asm/uaccess.h: In function 'strnlen_user':
> arch/sh/include/asm/uaccess.h:213: error: implicit declaration of function '__strnlen_user'
> ...
> make[2]: *** [init/main.o] Error 1
>
> <-- snip -->
>
> Reported-by: Adrian Bunk <[email protected]>
> Signed-off-by: Adrian Bunk <[email protected]>
>
Applied, thanks.