aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-04-03 10:03:03 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-04-10 01:38:59 -0400
commit283abedb1bd67e22f05fe4e79e1722bd7c7ed3be (patch)
tree823ff4345b88899e3b0ef04130e0623347afc413
parente9627da113db1b457a504ee4dca6c0a1a19e18fc (diff)
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>
-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 {
83 } ipl_info; 83 } ipl_info;
84} __packed __aligned(PAGE_SIZE); 84} __packed __aligned(PAGE_SIZE);
85 85
86/*
87 * IPL validity flags
88 */
89extern u32 ipl_flags;
90
91struct save_area; 86struct save_area;
92struct save_area * __init save_area_alloc(bool is_boot_cpu); 87struct save_area * __init save_area_alloc(bool is_boot_cpu);
93struct save_area * __init save_area_boot_cpu(void); 88struct save_area * __init save_area_boot_cpu(void);
@@ -102,11 +97,6 @@ extern void ipl_update_parameters(void);
102extern size_t append_ipl_vmparm(char *, size_t); 97extern size_t append_ipl_vmparm(char *, size_t);
103extern size_t append_ipl_scpdata(char *, size_t); 98extern size_t append_ipl_scpdata(char *, size_t);
104 99
105enum {
106 IPL_DEVNO_VALID = 1,
107 IPL_PARMBLOCK_VALID = 2,
108};
109
110enum ipl_type { 100enum ipl_type {
111 IPL_TYPE_UNKNOWN = 1, 101 IPL_TYPE_UNKNOWN = 1,
112 IPL_TYPE_CCW = 2, 102 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)
119 } 119 }
120} 120}
121 121
122u32 ipl_flags; 122enum {
123 IPL_DEVNO_VALID = 1,
124 IPL_PARMBLOCK_VALID = 2,
125};
126
127/*
128 * IPL validity flags
129 */
130static u32 ipl_flags;
123 131
124enum ipl_method { 132enum ipl_method {
125 REIPL_METHOD_CCW_CIO, 133 REIPL_METHOD_CCW_CIO,