Commit 035248a7 authored by Sven Schnelle's avatar Sven Schnelle Committed by Vasily Gorbik
Browse files

s390/alternatives: Remove noaltinstr option 



The current Kernel doesn't boot without alternative patching on
z16 machines. To avoid such bugs in the future, remove the option
disable alternative patching.

Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Reviewed-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent d3604ffb

Documentation/admin-guide/kernel-parameters.txt

+0 −3
Original line number Diff line number Diff line
@@ -3830,9 +3830,6 @@ 


	noalign		[KNL,ARM]



	noaltinstr	[S390,EARLY] Disables alternative instructions

			patching (CPU alternatives feature).



	noapic		[SMP,APIC,EARLY] Tells the kernel to not make use of any

			IOAPICs that may be present in the system.

arch/s390/kernel/alternative.c

+2 −19
Original line number Diff line number Diff line
@@ -7,17 +7,7 @@ 
#include <asm/facility.h>

#include <asm/nospec-branch.h>



static int __initdata_or_module alt_instr_disabled;



static int __init disable_alternative_instructions(char *str)

{

	alt_instr_disabled = 1;

	return 0;

}



early_param("noaltinstr", disable_alternative_instructions);



static void __init_or_module __apply_alternatives(struct alt_instr *start,

void __init_or_module apply_alternatives(struct alt_instr *start,

					 struct alt_instr *end)

{

	struct alt_instr *a;
@@ -37,13 +27,6 @@ static void __init_or_module __apply_alternatives(struct alt_instr *start, 
	}

}



void __init_or_module apply_alternatives(struct alt_instr *start,

					 struct alt_instr *end)

{

	if (!alt_instr_disabled)

		__apply_alternatives(start, end);

}



extern struct alt_instr __alt_instructions[], __alt_instructions_end[];

void __init apply_alternative_instructions(void)

{