diff options
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index f73a11528217..03739813d3bf 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -129,7 +129,7 @@ char vmhalt_cmd[128] = ""; | |||
129 | char vmpoff_cmd[128] = ""; | 129 | char vmpoff_cmd[128] = ""; |
130 | static char vmpanic_cmd[128] = ""; | 130 | static char vmpanic_cmd[128] = ""; |
131 | 131 | ||
132 | static inline void strncpy_skip_quote(char *dst, char *src, int n) | 132 | static void strncpy_skip_quote(char *dst, char *src, int n) |
133 | { | 133 | { |
134 | int sx, dx; | 134 | int sx, dx; |
135 | 135 | ||
@@ -396,8 +396,8 @@ early_param("ipldelay", early_parse_ipldelay); | |||
396 | unsigned int switch_amode = 0; | 396 | unsigned int switch_amode = 0; |
397 | EXPORT_SYMBOL_GPL(switch_amode); | 397 | EXPORT_SYMBOL_GPL(switch_amode); |
398 | 398 | ||
399 | static inline void set_amode_and_uaccess(unsigned long user_amode, | 399 | static void set_amode_and_uaccess(unsigned long user_amode, |
400 | unsigned long user32_amode) | 400 | unsigned long user32_amode) |
401 | { | 401 | { |
402 | psw_user_bits = PSW_BASE_BITS | PSW_MASK_DAT | user_amode | | 402 | psw_user_bits = PSW_BASE_BITS | PSW_MASK_DAT | user_amode | |
403 | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK | | 403 | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK | |