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

Commit a4f32bdb authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/mm: keep fault_init() private to fault.c 



Just convert fault_init() to an early initcall. That's still early
enough since it only needs be called before user space processes get
executed. No reason to externalize it.
Also add the function to the init section and move the store_indication
variable to the read_mostly section.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 287a0933

arch/s390/include/asm/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
extern pgd_t swapper_pg_dir[] __attribute__ ((aligned (4096)));

extern void paging_init(void);

extern void vmem_map_init(void);

extern void fault_init(void);



/*

 * The S390 doesn't have any external MMU info: the kernel page

arch/s390/mm/fault.c

+8 −4
Original line number Diff line number Diff line
@@ -51,13 +51,17 @@ 
#define VM_FAULT_BADACCESS	0x040000

#define VM_FAULT_SIGNAL		0x080000



static unsigned long store_indication;

static unsigned long store_indication __read_mostly;



void fault_init(void)

#ifdef CONFIG_64BIT

static int __init fault_init(void)

{

	if (test_facility(2) && test_facility(75))

	if (test_facility(75))

		store_indication = 0xc00;

	return 0;

}

early_initcall(fault_init);

#endif



static inline int notify_page_fault(struct pt_regs *regs)

{

arch/s390/mm/init.c

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ void __init paging_init(void) 
	max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

	free_area_init_nodes(max_zone_pfns);

	fault_init();

}



void __init mem_init(void)