From: Paolo 'Blaisorblade' Giarrusso Fix prototypes in user.h - was needed when including user.h in kernelspace, as we did in previous patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton --- arch/um/include/user.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff -puN arch/um/include/user.h~uml-fix-prototypes arch/um/include/user.h --- a/arch/um/include/user.h~uml-fix-prototypes +++ a/arch/um/include/user.h @@ -6,6 +6,10 @@ #ifndef __USER_H__ #define __USER_H__ +/* Both on kernelspace and userspace this will provide the size_t definition. It should, at + * least. But on userspace it won't hurt surely. */ +#include + extern void panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); extern int printk(const char *fmt, ...) @@ -13,9 +17,8 @@ extern int printk(const char *fmt, ...) extern void schedule(void); extern int in_aton(char *str); extern int open_gdb_chan(void); -/* These use size_t, however unsigned long is correct on both i386 and x86_64. */ -extern unsigned long strlcpy(char *, const char *, unsigned long); -extern unsigned long strlcat(char *, const char *, unsigned long); +extern size_t strlcpy(char *, const char *, size_t); +extern size_t strlcat(char *, const char *, size_t); #endif _