projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acpi-fan', 'acpi-ec', 'acpi-drivers' and 'acpi-osl'
[cascardo/linux.git]
/
mm
/
internal.h
diff --git
a/mm/internal.h
b/mm/internal.h
index
2524ec8
..
1501304
100644
(file)
--- a/
mm/internal.h
+++ b/
mm/internal.h
@@
-36,6
+36,8
@@
/* Do not use these with a slab allocator */
#define GFP_SLAB_BUG_MASK (__GFP_DMA32|__GFP_HIGHMEM|~__GFP_BITS_MASK)
/* Do not use these with a slab allocator */
#define GFP_SLAB_BUG_MASK (__GFP_DMA32|__GFP_HIGHMEM|~__GFP_BITS_MASK)
+int do_swap_page(struct fault_env *fe, pte_t orig_pte);
+
void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
unsigned long floor, unsigned long ceiling);
void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
unsigned long floor, unsigned long ceiling);
@@
-76,7
+78,7
@@
extern unsigned long highest_memmap_pfn;
*/
extern int isolate_lru_page(struct page *page);
extern void putback_lru_page(struct page *page);
*/
extern int isolate_lru_page(struct page *page);
extern void putback_lru_page(struct page *page);
-extern bool
zone_reclaimable(struct zone *zone
);
+extern bool
pgdat_reclaimable(struct pglist_data *pgdat
);
/*
* in mm/rmap.c:
/*
* in mm/rmap.c:
@@
-150,6
+152,8
@@
extern int __isolate_free_page(struct page *page, unsigned int order);
extern void __free_pages_bootmem(struct page *page, unsigned long pfn,
unsigned int order);
extern void prep_compound_page(struct page *page, unsigned int order);
extern void __free_pages_bootmem(struct page *page, unsigned long pfn,
unsigned int order);
extern void prep_compound_page(struct page *page, unsigned int order);
+extern void post_alloc_hook(struct page *page, unsigned int order,
+ gfp_t gfp_flags);
extern int user_min_free_kbytes;
#if defined CONFIG_COMPACTION || defined CONFIG_CMA
extern int user_min_free_kbytes;
#if defined CONFIG_COMPACTION || defined CONFIG_CMA
@@
-181,10
+185,7
@@
struct compact_control {
const unsigned int alloc_flags; /* alloc flags of a direct compactor */
const int classzone_idx; /* zone index of a direct compactor */
struct zone *zone;
const unsigned int alloc_flags; /* alloc flags of a direct compactor */
const int classzone_idx; /* zone index of a direct compactor */
struct zone *zone;
- int contended; /* Signal need_sched() or lock
- * contention detected during
- * compaction
- */
+ bool contended; /* Signal lock or sched contention */
};
unsigned long
};
unsigned long
@@
-429,10
+430,10
@@
static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn,
}
#endif /* CONFIG_SPARSEMEM */
}
#endif /* CONFIG_SPARSEMEM */
-#define
ZON
E_RECLAIM_NOSCAN -2
-#define
ZON
E_RECLAIM_FULL -1
-#define
ZON
E_RECLAIM_SOME 0
-#define
ZON
E_RECLAIM_SUCCESS 1
+#define
NOD
E_RECLAIM_NOSCAN -2
+#define
NOD
E_RECLAIM_FULL -1
+#define
NOD
E_RECLAIM_SOME 0
+#define
NOD
E_RECLAIM_SUCCESS 1
extern int hwpoison_filter(struct page *p);
extern int hwpoison_filter(struct page *p);
@@
-463,7
+464,6
@@
unsigned long reclaim_clean_pages_from_list(struct zone *zone,
#define ALLOC_HIGH 0x20 /* __GFP_HIGH set */
#define ALLOC_CPUSET 0x40 /* check for correct cpuset */
#define ALLOC_CMA 0x80 /* allow allocations from CMA areas */
#define ALLOC_HIGH 0x20 /* __GFP_HIGH set */
#define ALLOC_CPUSET 0x40 /* check for correct cpuset */
#define ALLOC_CMA 0x80 /* allow allocations from CMA areas */
-#define ALLOC_FAIR 0x100 /* fair zone allocation */
enum ttu_flags;
struct tlbflush_unmap_batch;
enum ttu_flags;
struct tlbflush_unmap_batch;