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
rk_sdmmc: recalculate audib rx_wmark
[firefly-linux-kernel-4.4.55.git]
/
mm
/
page_alloc.c
diff --git
a/mm/page_alloc.c
b/mm/page_alloc.c
index 4cfdc64482c85a59dc3e242ef793bcbfb5456315..bf6c9285013fb0372693ef82f75cdd50007b2620 100644
(file)
--- a/
mm/page_alloc.c
+++ b/
mm/page_alloc.c
@@
-1050,6
+1050,15
@@
__rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
page = list_entry(area->free_list[migratetype].next,
struct page, lru);
page = list_entry(area->free_list[migratetype].next,
struct page, lru);
+
+#ifdef CONFIG_ARCH_ROCKCHIP
+ if (is_migrate_cma(migratetype)){
+ int mt = get_pageblock_migratetype(page);
+ if (unlikely(is_migrate_isolate(mt)))
+ continue;
+ }
+#endif
+
area->nr_free--;
/*
area->nr_free--;
/*
@@
-4542,7
+4551,7
@@
static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone,
#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
/* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */
#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
/* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */
-void __init set_pageblock_order(void)
+void __
paging
init set_pageblock_order(void)
{
unsigned int order;
{
unsigned int order;
@@
-4570,7
+4579,7
@@
void __init set_pageblock_order(void)
* include/linux/pageblock-flags.h for the values of pageblock_order based on
* the kernel config
*/
* include/linux/pageblock-flags.h for the values of pageblock_order based on
* the kernel config
*/
-void __init set_pageblock_order(void)
+void __
paging
init set_pageblock_order(void)
{
}
{
}