diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-11-25 10:48:00 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-11-25 10:48:00 -0800 |
| commit | 27f6cbecbf60e2dd2be49a945e9966ed6b20b2de (patch) | |
| tree | 2416ab37445ec5ec8e669016a2d1f5573863d73c /include/linux/compaction.h | |
| parent | 7cf095f46f0ca52773a431db8ac0bf4a07a3501b (diff) | |
| parent | eb1852b10593dc3ca73e02bf9ac4753a5a464905 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
Diffstat (limited to 'include/linux/compaction.h')
| -rw-r--r-- | include/linux/compaction.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/compaction.h b/include/linux/compaction.h index cc9f7a428649..bb2bbdbe5464 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -24,8 +24,6 @@ extern unsigned long try_to_compact_pages(struct zonelist *zonelist, int order, gfp_t gfp_mask, nodemask_t *mask, bool sync); extern unsigned long compaction_suitable(struct zone *zone, int order); -extern unsigned long compact_zone_order(struct zone *zone, int order, - gfp_t gfp_mask, bool sync); /* Do not skip compaction more than 64 times */ #define COMPACT_MAX_DEFER_SHIFT 6 @@ -69,12 +67,6 @@ static inline unsigned long compaction_suitable(struct zone *zone, int order) return COMPACT_SKIPPED; } -static inline unsigned long compact_zone_order(struct zone *zone, int order, - gfp_t gfp_mask, bool sync) -{ - return COMPACT_CONTINUE; -} - static inline void defer_compaction(struct zone *zone) { } |