From: Vasily Gorbik <gor@linux.ibm.com>
Date: Tue, 3 Apr 2018 14:03:03 +0000 (+0200)
Subject: s390/ipl: move ipl_flags to ipl.c
X-Git-Tag: v4.17-rc1~26^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=283abedb1bd67e22f05fe4e79e1722bd7c7ed3be;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index 3a745343fe4ee..284acf81d0ad9 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 a2224f37e3a52..ffecd7cf34b68 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,