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

Commit 202b864a authored by Chen Liqin's avatar Chen Liqin
Browse files

score: fixed pfn_valid define. 



Signed-off-by: default avatarCui Bixiong <bixiong@sunnorth.com.cn>
Signed-off-by: default avatarChen Liqin <liqin.chen@sunplusct.com>

	modified:   arch/score/include/asm/page.h
	modified:   arch/score/kernel/setup.c
	modified:   arch/score/mm/init.c
parent 11ab3f3d

arch/score/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ extern unsigned long max_pfn; 
#define page_to_bus(page)	(page_to_phys(page))

#define phys_to_page(paddr)	(pfn_to_page(phys_to_pfn(paddr)))



#define pfn_valid(pfn)		((pfn) >= min_low_pfn && (pfn) < max_mapnr)

#define pfn_valid(pfn)		(((pfn) >= min_low_pfn) && ((pfn) < max_low_pfn))



#define ARCH_PFN_OFFSET		(PAGE_OFFSET >> PAGE_SHIFT)

arch/score/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static void __init bootmem_init(void) 


	min_low_pfn = PFN_UP(MEMORY_START);

	max_low_pfn = PFN_UP(MEMORY_START + MEMORY_SIZE);

	max_mapnr = max_low_pfn - min_low_pfn;



	/* Initialize the boot-time allocator with low memory only. */

	bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,

arch/score/mm/init.c

+0 −5
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ void __init mem_init(void) 
	unsigned long codesize, reservedpages, datasize, initsize;

	unsigned long tmp, ram = 0;



	max_mapnr = max_low_pfn;

	high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);

	totalram_pages += free_all_bootmem();

	totalram_pages -= setup_zero_page();	/* Setup zeroed pages. */
@@ -101,10 +100,6 @@ void __init mem_init(void) 
	datasize = (unsigned long) &_edata - (unsigned long) &_etext;

	initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;



	kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);

	kclist_add(&kcore_vmalloc, (void *) VMALLOC_START,

			VMALLOC_END - VMALLOC_START);



	printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "

			"%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",

			(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),