Skip to content

Commit a58ea04

Browse files
kaniiniquinndiggity
authored andcommitted
init: provide pax_softmode symbol unconditionally
Otherwise we have to add a bunch of #ifdefs when we otherwise would not need to. Fixes: a78588f ("init: add pax_softmode= kernel command-line option") Fixes: #1 Signed-off-by: Ariadne Conill <[email protected]> Signed-off-by: Quinn Diggity <[email protected]>
1 parent b8e4e93 commit a58ea04

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

include/linux/init.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,7 @@ extern char __initdata boot_command_line[];
138138
extern char *saved_command_line;
139139
extern unsigned int saved_command_line_len;
140140
extern unsigned int reset_devices;
141-
#ifdef CONFIG_OPENPAX_SOFTMODE
142141
extern int pax_softmode;
143-
#endif
144142

145143
/* used by init/main.c */
146144
void setup_arch(char **);

init/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ static int __init set_reset_devices(char *str)
190190

191191
__setup("reset_devices", set_reset_devices);
192192

193-
#ifdef CONFIG_OPENPAX_SOFTMODE
194193
int pax_softmode;
195194

195+
#ifdef CONFIG_OPENPAX_SOFTMODE
196196
static int __init setup_pax_softmode(char *str)
197197
{
198198
get_option(&str, &pax_softmode);

0 commit comments

Comments
 (0)