ocfs2: Better I/O error handling in heartbeat

[linux-2.6-omap-h63xx.git] / include / linux / string.h

diff --git a/include/linux/string.h b/include/linux/string.h
index dab2652acbd8354a5f19745d6d1cac4ad7500ea0..dee221429ad0b96c86bdd0035b2a42571d634ab1 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -18,6 +18,8 @@ extern char * strsep(char **,const char *);
 extern __kernel_size_t strspn(const char *,const char *);
 extern __kernel_size_t strcspn(const char *,const char *);
 
+extern char *strndup_user(const char __user *, long);
+
 /*
  * Include machine specific inline routines
  */
@@ -88,7 +90,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, unsigned int __nocast gfp);
+extern char *kstrdup(const char *s, gfp_t gfp);
 
 #ifdef __cplusplus
 }