summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-04-03 17:03:03 +0300
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-04-10 08:38:59 +0300
commit283abedb1bd67e22f05fe4e79e1722bd7c7ed3be (patch)
tree823ff4345b88899e3b0ef04130e0623347afc413 /arch/s390
parente9627da113db1b457a504ee4dca6c0a1a19e18fc (diff)
downloadlinux-283abedb1bd67e22f05fe4e79e1722bd7c7ed3be.tar.xz
s390/ipl: move ipl_flags to ipl.c
ipl_flags and corresponding enum are not used outside of ipl.c and will be reworked in later commits. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/ipl.h10
-rw-r--r--arch/s390/kernel/ipl.c10
2 files changed, 9 insertions, 11 deletions
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index 3a745343fe4e..284acf81d0ad 100644
--- a/arch/s390/include/asm/ipl.h
+++ b/arch/s390/include/asm/ipl.h
@@ -83,11 +83,6 @@ struct ipl_parameter_block {
} ipl_info;
} __packed __aligned(PAGE_SIZE);
-/*
- * IPL validity flags
- */
-extern u32 ipl_flags;
-
struct save_area;
struct save_area * __init save_area_alloc(bool is_boot_cpu);
struct save_area * __init save_area_boot_cpu(void);
@@ -102,11 +97,6 @@ extern void ipl_update_parameters(void);
extern size_t append_ipl_vmparm(char *, size_t);
extern size_t append_ipl_scpdata(char *, size_t);
-enum {
- IPL_DEVNO_VALID = 1,
- IPL_PARMBLOCK_VALID = 2,
-};
-
enum ipl_type {
IPL_TYPE_UNKNOWN = 1,
IPL_TYPE_CCW = 2,
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index a2224f37e3a5..ffecd7cf34b6 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -119,7 +119,15 @@ static char *dump_type_str(enum dump_type type)
}
}
-u32 ipl_flags;
+enum {
+ IPL_DEVNO_VALID = 1,
+ IPL_PARMBLOCK_VALID = 2,
+};
+
+/*
+ * IPL validity flags
+ */
+static u32 ipl_flags;
enum ipl_method {
REIPL_METHOD_CCW_CIO,