diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-15 11:24:32 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-15 11:24:32 +0100 |
| commit | 8229c885fe361e521ac64de36b16011e54a30de0 (patch) | |
| tree | 572e5d34b16713ddef9e803308c6f72014aff01b /fs/xfs/kmem.h | |
| parent | drm: Add drm_mode_copy() (diff) | |
| parent | Linux 3.3-rc7 (diff) | |
| download | linux-8229c885fe361e521ac64de36b16011e54a30de0.tar.xz linux-8229c885fe361e521ac64de36b16011e54a30de0.zip | |
drm: Merge tag 'v3.3-rc7' into drm-core-next
Merge the fixes so far into core-next, needed to test
intel driver.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'fs/xfs/kmem.h')
| -rw-r--r-- | fs/xfs/kmem.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index 292eff198030..ab7c53fe346e 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h @@ -110,10 +110,4 @@ kmem_zone_destroy(kmem_zone_t *zone) extern void *kmem_zone_alloc(kmem_zone_t *, unsigned int __nocast); extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast); -static inline int -kmem_shake_allow(gfp_t gfp_mask) -{ - return ((gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_FS)); -} - #endif /* __XFS_SUPPORT_KMEM_H__ */ |