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

Commit 4fcb2083 authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: move function and variable declarations to asm/init.h 



Impact: cleanup

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1236257708-27269-17-git-send-email-penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e53fb04f

arch/x86/include/asm/init.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_INIT_32_H

#define _ASM_X86_INIT_32_H



#ifdef CONFIG_X86_32

extern void __init early_ioremap_page_table_range_init(void);

#endif



extern unsigned long __init

kernel_physical_mapping_init(unsigned long start,

			     unsigned long end,

			     unsigned long page_size_mask);





extern unsigned long __initdata e820_table_start;

extern unsigned long __meminitdata e820_table_end;

extern unsigned long __meminitdata e820_table_top;



#endif /* _ASM_X86_INIT_32_H */

arch/x86/mm/init.c

+1 −9
Original line number Diff line number Diff line
@@ -3,21 +3,13 @@ 


#include <asm/cacheflush.h>

#include <asm/e820.h>

#include <asm/init.h>

#include <asm/page.h>

#include <asm/page_types.h>

#include <asm/sections.h>

#include <asm/system.h>

#include <asm/tlbflush.h>



#ifdef CONFIG_X86_32

extern void __init early_ioremap_page_table_range_init(void);

#endif



extern unsigned long __init

kernel_physical_mapping_init(unsigned long start,

			     unsigned long end,

			     unsigned long page_size_mask);



unsigned long __initdata e820_table_start;

unsigned long __meminitdata e820_table_end;

unsigned long __meminitdata e820_table_top;

arch/x86/mm/init_32.c

+1 −5
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <asm/paravirt.h>

#include <asm/setup.h>

#include <asm/cacheflush.h>

#include <asm/init.h>



unsigned long max_low_pfn_mapped;

unsigned long max_pfn_mapped;
@@ -58,11 +59,6 @@ unsigned long highstart_pfn, highend_pfn; 


static noinline int do_test_wp_bit(void);





extern unsigned long __initdata e820_table_start;

extern unsigned long __meminitdata e820_table_end;

extern unsigned long __meminitdata e820_table_top;



static __init void *alloc_low_page(void)

{

	unsigned long pfn = e820_table_end++;

arch/x86/mm/init_64.c

+1 −4
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <asm/kdebug.h>

#include <asm/numa.h>

#include <asm/cacheflush.h>

#include <asm/init.h>



/*

 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
@@ -283,10 +284,6 @@ void __init cleanup_highmap(void) 
	}

}



extern unsigned long __initdata e820_table_start;

extern unsigned long __meminitdata e820_table_end;

extern unsigned long __meminitdata e820_table_top;



static __ref void *alloc_low_page(unsigned long *phys)

{

	unsigned long pfn = e820_table_end++;