Commit c5e97ed1 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Vlastimil Babka

bootmem: Use page->index instead of page->freelist

page->freelist is for the use of slab.  Using page->index is the same
set of bits as page->freelist, and by using an integer instead of a
pointer, we can avoid casts.
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: <x86@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
parent ffedd09f
...@@ -981,7 +981,7 @@ static void __meminit free_pagetable(struct page *page, int order) ...@@ -981,7 +981,7 @@ static void __meminit free_pagetable(struct page *page, int order)
if (PageReserved(page)) { if (PageReserved(page)) {
__ClearPageReserved(page); __ClearPageReserved(page);
magic = (unsigned long)page->freelist; magic = page->index;
if (magic == SECTION_INFO || magic == MIX_SECTION_INFO) { if (magic == SECTION_INFO || magic == MIX_SECTION_INFO) {
while (nr_pages--) while (nr_pages--)
put_page_bootmem(page++); put_page_bootmem(page++);
......
...@@ -30,7 +30,7 @@ void put_page_bootmem(struct page *page); ...@@ -30,7 +30,7 @@ void put_page_bootmem(struct page *page);
*/ */
static inline void free_bootmem_page(struct page *page) static inline void free_bootmem_page(struct page *page)
{ {
unsigned long magic = (unsigned long)page->freelist; unsigned long magic = page->index;
/* /*
* The reserve_bootmem_region sets the reserved flag on bootmem * The reserve_bootmem_region sets the reserved flag on bootmem
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
void get_page_bootmem(unsigned long info, struct page *page, unsigned long type) void get_page_bootmem(unsigned long info, struct page *page, unsigned long type)
{ {
page->freelist = (void *)type; page->index = type;
SetPagePrivate(page); SetPagePrivate(page);
set_page_private(page, info); set_page_private(page, info);
page_ref_inc(page); page_ref_inc(page);
...@@ -23,14 +23,13 @@ void get_page_bootmem(unsigned long info, struct page *page, unsigned long type) ...@@ -23,14 +23,13 @@ void get_page_bootmem(unsigned long info, struct page *page, unsigned long type)
void put_page_bootmem(struct page *page) void put_page_bootmem(struct page *page)
{ {
unsigned long type; unsigned long type = page->index;
type = (unsigned long) page->freelist;
BUG_ON(type < MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE || BUG_ON(type < MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE ||
type > MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE); type > MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE);
if (page_ref_dec_return(page) == 1) { if (page_ref_dec_return(page) == 1) {
page->freelist = NULL; page->index = 0;
ClearPagePrivate(page); ClearPagePrivate(page);
set_page_private(page, 0); set_page_private(page, 0);
INIT_LIST_HEAD(&page->lru); INIT_LIST_HEAD(&page->lru);
......
...@@ -722,7 +722,7 @@ static void free_map_bootmem(struct page *memmap) ...@@ -722,7 +722,7 @@ static void free_map_bootmem(struct page *memmap)
>> PAGE_SHIFT; >> PAGE_SHIFT;
for (i = 0; i < nr_pages; i++, page++) { for (i = 0; i < nr_pages; i++, page++) {
magic = (unsigned long) page->freelist; magic = page->index;
BUG_ON(magic == NODE_INFO); BUG_ON(magic == NODE_INFO);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment