projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
compaction.h
diff --git
a/include/linux/compaction.h
b/include/linux/compaction.h
index cc9f7a4286490a3bae2d47db3fe74d2dabfd4aac..bb2bbdbe546495e1f0ab94e87b58578bc5c0c53f 100644
(file)
--- 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);
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
/* 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;
}
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)
{
}
static inline void defer_compaction(struct zone *zone)
{
}