Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

[linux-2.6] / include / linux / string.h

diff --git a/include/linux/string.h b/include/linux/string.h
index 93994c61309538a8847c84911c6d78ded396bcd7..dab2652acbd8354a5f19745d6d1cac4ad7500ea0 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -88,7 +88,7 @@ extern int memcmp(const void *,const void *,__kernel_size_t);
 extern void * memchr(const void *,int,__kernel_size_t);
 #endif
 
-extern char *kstrdup(const char *s, int gfp);
+extern char *kstrdup(const char *s, unsigned int __nocast gfp);
 
 #ifdef __cplusplus
 }