The patch titled
uml: fix prototypes
has been added to the -mm tree. Its filename is
uml-fix-prototypes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: fix prototypes
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
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 <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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 <linux/types.h>
+
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
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
uml-mode_tt-is-bust.patch
fix-typo-in-memory-barrier-docs.patch
uml-remove-some-leftover-ppc-code.patch
uml-split-memory-allocation-prototypes-out-of-userh.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
uml-code-convention-cleanup-of-a-file.patch
uml-reenable-compilation-of-enable_timer-disabled-by-mistake.patch
uml-use-defconfig_list-to-avoid-reading-hosts-config.patch
uml-cleanup-run_helper-api-to-fix-a-leak.patch
uml-kconfig-silence-warning.patch
uml-mmapper-remove-just-added-but-wrong-const-attribute.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
