summaryrefslogtreecommitdiffstats
path: root/fs/ntfs
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-11 09:29:48 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-10-11 09:29:48 +0100
commit29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch)
treef2378e8d2fbef7fc215a25acf2042b8965109e5e /fs/ntfs
parente9438250b635f7832e99a8c8d2e394dd1522ce65 (diff)
parent907a42617970a159361f17ef9a63f04d276995ab (diff)
downloadlinux-29d8699ebb1e8948a612306c69e6d9c4ef23342f.tar.gz
linux-29d8699ebb1e8948a612306c69e6d9c4ef23342f.tar.bz2
linux-29d8699ebb1e8948a612306c69e6d9c4ef23342f.zip
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/ntfs')
-rw-r--r--fs/ntfs/malloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
index 006946efca8c..590887b943f5 100644
--- 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 __nocast gfp_mask)
+ gfp_t gfp_mask)
{
if (likely(size <= PAGE_SIZE)) {
BUG_ON(!size);