projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "USB: pci-quirks: Add Raspberry Pi 4 quirk"
[linux-2.6-microblaze.git]
/
mm
/
migrate.c
diff --git
a/mm/migrate.c
b/mm/migrate.c
index
5053439
..
34a842a
100644
(file)
--- a/
mm/migrate.c
+++ b/
mm/migrate.c
@@
-193,7
+193,7
@@
void putback_movable_pages(struct list_head *l)
put_page(page);
} else {
mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON +
put_page(page);
} else {
mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON +
- page_is_file_lru(page), -
hpage
_nr_pages(page));
+ page_is_file_lru(page), -
thp
_nr_pages(page));
putback_lru_page(page);
}
}
putback_lru_page(page);
}
}
@@
-386,7
+386,7
@@
static int expected_page_refs(struct address_space *mapping, struct page *page)
*/
expected_count += is_device_private_page(page);
if (mapping)
*/
expected_count += is_device_private_page(page);
if (mapping)
- expected_count +=
hpage
_nr_pages(page) + page_has_private(page);
+ expected_count +=
thp
_nr_pages(page) + page_has_private(page);
return expected_count;
}
return expected_count;
}
@@
-441,7
+441,7
@@
int migrate_page_move_mapping(struct address_space *mapping,
*/
newpage->index = page->index;
newpage->mapping = page->mapping;
*/
newpage->index = page->index;
newpage->mapping = page->mapping;
- page_ref_add(newpage,
hpage
_nr_pages(page)); /* add cache reference */
+ page_ref_add(newpage,
thp
_nr_pages(page)); /* add cache reference */
if (PageSwapBacked(page)) {
__SetPageSwapBacked(newpage);
if (PageSwapCache(page)) {
if (PageSwapBacked(page)) {
__SetPageSwapBacked(newpage);
if (PageSwapCache(page)) {
@@
-474,7
+474,7
@@
int migrate_page_move_mapping(struct address_space *mapping,
* to one less reference.
* We know this isn't the last reference.
*/
* to one less reference.
* We know this isn't the last reference.
*/
- page_ref_unfreeze(page, expected_count -
hpage
_nr_pages(page));
+ page_ref_unfreeze(page, expected_count -
thp
_nr_pages(page));
xas_unlock(&xas);
/* Leave irq disabled to prevent preemption while updating stats */
xas_unlock(&xas);
/* Leave irq disabled to prevent preemption while updating stats */
@@
-591,7
+591,7
@@
static void copy_huge_page(struct page *dst, struct page *src)
} else {
/* thp page */
BUG_ON(!PageTransHuge(src));
} else {
/* thp page */
BUG_ON(!PageTransHuge(src));
- nr_pages =
hpage
_nr_pages(src);
+ nr_pages =
thp
_nr_pages(src);
}
for (i = 0; i < nr_pages; i++) {
}
for (i = 0; i < nr_pages; i++) {
@@
-1213,7
+1213,7
@@
out:
*/
if (likely(!__PageMovable(page)))
mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON +
*/
if (likely(!__PageMovable(page)))
mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON +
- page_is_file_lru(page), -
hpage
_nr_pages(page));
+ page_is_file_lru(page), -
thp
_nr_pages(page));
}
/*
}
/*
@@
-1446,7
+1446,7
@@
retry:
* during migration.
*/
is_thp = PageTransHuge(page);
* during migration.
*/
is_thp = PageTransHuge(page);
- nr_subpages =
hpage
_nr_pages(page);
+ nr_subpages =
thp
_nr_pages(page);
cond_resched();
if (PageHuge(page))
cond_resched();
if (PageHuge(page))
@@
-1670,7
+1670,7
@@
static int add_page_for_migration(struct mm_struct *mm, unsigned long addr,
list_add_tail(&head->lru, pagelist);
mod_node_page_state(page_pgdat(head),
NR_ISOLATED_ANON + page_is_file_lru(head),
list_add_tail(&head->lru, pagelist);
mod_node_page_state(page_pgdat(head),
NR_ISOLATED_ANON + page_is_file_lru(head),
-
hpage
_nr_pages(head));
+
thp
_nr_pages(head));
}
out_putpage:
/*
}
out_putpage:
/*
@@
-2034,7
+2034,7
@@
static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
page_lru = page_is_file_lru(page);
mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + page_lru,
page_lru = page_is_file_lru(page);
mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + page_lru,
-
hpage
_nr_pages(page));
+
thp
_nr_pages(page));
/*
* Isolating the page has taken another reference, so the
/*
* Isolating the page has taken another reference, so the