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

Commit 293926b3 authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman
Browse files

x86/cpu/bugs: Use __initconst for 'const' init data 



commit 1de7edbb59c8f1b46071f66c5c97b8a59569eb51 upstream.

Some of the recently added const tables use __initdata which causes section
attribute conflicts.

Use __initconst instead.

Fixes: fa1202ef2243 ("x86/speculation: Add command line control")
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20190330004743.29541-9-andi@firstfloor.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f45829e6

arch/x86/kernel/cpu/bugs.c

+3 −3
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static const struct { 
	const char			*option;

	enum spectre_v2_user_cmd	cmd;

	bool				secure;

} v2_user_options[] __initdata = {

} v2_user_options[] __initconst = {

	{ "auto",		SPECTRE_V2_USER_CMD_AUTO,		false },

	{ "off",		SPECTRE_V2_USER_CMD_NONE,		false },

	{ "on",			SPECTRE_V2_USER_CMD_FORCE,		true  },
@@ -407,7 +407,7 @@ static const struct { 
	const char *option;

	enum spectre_v2_mitigation_cmd cmd;

	bool secure;

} mitigation_options[] __initdata = {

} mitigation_options[] __initconst = {

	{ "off",		SPECTRE_V2_CMD_NONE,		  false },

	{ "on",			SPECTRE_V2_CMD_FORCE,		  true  },

	{ "retpoline",		SPECTRE_V2_CMD_RETPOLINE,	  false },
@@ -643,7 +643,7 @@ static const char * const ssb_strings[] = { 
static const struct {

	const char *option;

	enum ssb_mitigation_cmd cmd;

} ssb_mitigation_options[]  __initdata = {

} ssb_mitigation_options[]  __initconst = {

	{ "auto",	SPEC_STORE_BYPASS_CMD_AUTO },    /* Platform decides */

	{ "on",		SPEC_STORE_BYPASS_CMD_ON },      /* Disable Speculative Store Bypass */

	{ "off",	SPEC_STORE_BYPASS_CMD_NONE },    /* Don't touch Speculative Store Bypass */