Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9aac10d authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86-64: Remove redundant max_mapnr and replace with end_pfn 



The FLATMEM people added it, but there doesn't seem a good reason
because end_pfn is identical.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0a43e4bf

arch/x86_64/mm/init.c

+0 −5
Original line number Diff line number Diff line
@@ -411,11 +411,6 @@ void __init mem_init(void) 
#ifdef CONFIG_NUMA

	totalram_pages = numa_free_all_bootmem();

#else



#ifdef CONFIG_FLATMEM

	max_mapnr = end_pfn;

	if (!mem_map) BUG();

#endif

	totalram_pages = free_all_bootmem();

#endif

	reservedpages = end_pfn - totalram_pages - e820_hole_size(0, end_pfn);

include/asm-x86_64/page.h

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#ifdef __KERNEL__

#ifndef __ASSEMBLY__



extern unsigned long end_pfn;



void clear_page(void *);

void copy_page(void *, void *);
@@ -111,7 +113,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; 
#ifdef CONFIG_FLATMEM

#define pfn_to_page(pfn)	(mem_map + (pfn))

#define page_to_pfn(page)	((unsigned long)((page) - mem_map))

#define pfn_valid(pfn)		((pfn) < max_mapnr)

#define pfn_valid(pfn)		((pfn) < end_pfn)

#endif



#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)

include/asm-x86_64/proto.h

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ extern int unhandled_signal(struct task_struct *tsk, int sig); 
extern void select_idle_routine(const struct cpuinfo_x86 *c);

extern void swiotlb_init(void);



extern unsigned long max_mapnr;

extern unsigned long end_pfn; 

extern unsigned long table_start, table_end;



extern int exception_trace;