Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / um / include / user.h

diff --git a/arch/um/include/user.h b/arch/um/include/user.h
index 0f865ef46918190d528f556506ca9439d75da175..acadce3f271f05d2833790c82922140b539d4dc4 100644 (file)
--- a/arch/um/include/user.h
+++ b/arch/um/include/user.h
@@ -6,19 +6,16 @@
 #ifndef __USER_H__
 #define __USER_H__
 
-extern void panic(const char *fmt, ...);
-extern int printk(const char *fmt, ...);
+extern void panic(const char *fmt, ...)
+       __attribute__ ((format (printf, 1, 2)));
+extern int printk(const char *fmt, ...)
+       __attribute__ ((format (printf, 1, 2)));
 extern void schedule(void);
-extern void *um_kmalloc(int size);
-extern void *um_kmalloc_atomic(int size);
-extern void kfree(void *ptr);
 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 void *um_vmalloc(int size);
-extern void vfree(void *ptr);
 
 #endif