diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
| commit | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch) | |
| tree | f0816c90ae937a159f8bfec6018a6271223b954a /include/linux/reiserfs_fs.h | |
| parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
| parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
Auto-update from upstream
Diffstat (limited to 'include/linux/reiserfs_fs.h')
| -rw-r--r-- | include/linux/reiserfs_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index af00b10294cd..001ab82df051 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
| @@ -1972,7 +1972,7 @@ extern struct address_space_operations reiserfs_address_space_operations; | |||
| 1972 | 1972 | ||
| 1973 | /* fix_nodes.c */ | 1973 | /* fix_nodes.c */ |
| 1974 | #ifdef CONFIG_REISERFS_CHECK | 1974 | #ifdef CONFIG_REISERFS_CHECK |
| 1975 | void *reiserfs_kmalloc(size_t size, int flags, struct super_block *s); | 1975 | void *reiserfs_kmalloc(size_t size, gfp_t flags, struct super_block *s); |
| 1976 | void reiserfs_kfree(const void *vp, size_t size, struct super_block *s); | 1976 | void reiserfs_kfree(const void *vp, size_t size, struct super_block *s); |
| 1977 | #else | 1977 | #else |
| 1978 | static inline void *reiserfs_kmalloc(size_t size, int flags, | 1978 | static inline void *reiserfs_kmalloc(size_t size, int flags, |