diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 18:36:08 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 18:36:08 +0300 |
| commit | dd05e42fa86e37b14f8169bbad8d334e2e8d4881 (patch) | |
| tree | 662097ff3a8451a565c8c808ee9f66c95bcf736b /fs/ntfs/malloc.h | |
| parent | c1d962035d49565d8c7a2d97519012ccb861778a (diff) | |
| parent | 1f04c0a24b2f3cfe89c802a24396263623e3512d (diff) | |
| download | linux-dd05e42fa86e37b14f8169bbad8d334e2e8d4881.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Diffstat (limited to 'fs/ntfs/malloc.h')
| -rw-r--r-- | fs/ntfs/malloc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h index 590887b943f5..e38e402e4103 100644 --- a/fs/ntfs/malloc.h +++ b/fs/ntfs/malloc.h @@ -39,8 +39,7 @@ * If there was insufficient memory to complete the request, return NULL. * Depending on @gfp_mask the allocation may be guaranteed to succeed. */ -static inline void *__ntfs_malloc(unsigned long size, - gfp_t gfp_mask) +static inline void *__ntfs_malloc(unsigned long size, gfp_t gfp_mask) { if (likely(size <= PAGE_SIZE)) { BUG_ON(!size); |