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

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

s390/mm: shorten addressing mode initialization 



Shorten the code for addressing mode initialization. Also add missing
__init annotations, since this code is only used during kernel initialization.

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

arch/s390/kernel/setup.c

+10 −18
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ early_param("vmalloc", parse_vmalloc); 
unsigned int s390_user_mode = PRIMARY_SPACE_MODE;

EXPORT_SYMBOL_GPL(s390_user_mode);



static int set_amode_primary(void)

static void __init set_user_mode_primary(void)

{

	psw_kernel_bits = (psw_kernel_bits & ~PSW_MASK_ASC) | PSW_ASC_HOME;

	psw_user_bits = (psw_user_bits & ~PSW_MASK_ASC) | PSW_ASC_PRIMARY;
@@ -313,14 +313,7 @@ static int set_amode_primary(void) 
	psw32_user_bits =

		(psw32_user_bits & ~PSW32_MASK_ASC) | PSW32_ASC_PRIMARY;

#endif



	if (MACHINE_HAS_MVCOS) {

		memcpy(&uaccess, &uaccess_mvcos_switch, sizeof(uaccess));

		return 1;

	} else {

		memcpy(&uaccess, &uaccess_pt, sizeof(uaccess));

		return 0;

	}

	uaccess = MACHINE_HAS_MVCOS ? uaccess_mvcos_switch : uaccess_pt;

}



static int __init early_parse_user_mode(char *p)
@@ -335,16 +328,15 @@ static int __init early_parse_user_mode(char *p) 
}

early_param("user_mode", early_parse_user_mode);



static void setup_addressing_mode(void)

static void __init setup_addressing_mode(void)

{

	if (s390_user_mode == PRIMARY_SPACE_MODE) {

		if (set_amode_primary())

			pr_info("Address spaces switched, "

				"mvcos available\n");

	if (s390_user_mode != PRIMARY_SPACE_MODE)

		return;

	set_user_mode_primary();

	if (MACHINE_HAS_MVCOS)

		pr_info("Address spaces switched, mvcos available\n");

	else

			pr_info("Address spaces switched, "

				"mvcos not available\n");

	}

		pr_info("Address spaces switched, mvcos not available\n");

}



void *restart_stack __attribute__((__section__(".data")));