diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-07-12 15:06:31 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-07-12 15:06:31 -0700 |
| commit | c27510c031cae15f84b90f28d6dc02c314d84cf8 (patch) | |
| tree | ece97a4b2f3d8e5ce3588c55f353a16c46101d8f /include/linux/string.h | |
| parent | ab997aaeb9cf7a0da1cecc46c5bb6c7262416917 (diff) | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 93994c613095..dab2652acbd8 100644 --- 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 } |