projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /usr/src/ntfs-2.6/
[linux-2.6-block.git]
/
fs
/
ntfs
/
malloc.h
diff --git
a/fs/ntfs/malloc.h
b/fs/ntfs/malloc.h
index 006946efca8cf158daf7108a368a9b180cfa792d..590887b943f511ca964bc1c4cd30dc4cf7e0b0fd 100644
(file)
--- a/
fs/ntfs/malloc.h
+++ b/
fs/ntfs/malloc.h
@@
-40,7
+40,7
@@
* Depending on @gfp_mask the allocation may be guaranteed to succeed.
*/
static inline void *__ntfs_malloc(unsigned long size,
-
unsigned int __nocas
t gfp_mask)
+
gfp_
t gfp_mask)
{
if (likely(size <= PAGE_SIZE)) {
BUG_ON(!size);