diff options
| author | Michael Holzheu <holzheu@de.ibm.com> | 2007-02-21 10:55:21 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-02-21 10:55:21 +0100 |
| commit | 46b05d2617c8efd8ec6b19acd2c95541a0118c13 (patch) | |
| tree | 518998d59432b6387de28021780a84c42f1c116b /arch/s390 | |
| parent | 72960a02c270950253126ee8b339afd400f55273 (diff) | |
| download | blackbird-obmc-linux-46b05d2617c8efd8ec6b19acd2c95541a0118c13.tar.gz blackbird-obmc-linux-46b05d2617c8efd8ec6b19acd2c95541a0118c13.zip | |
[S390] New header file ipl.h
Setup.h has been misused for ipl related stuff in the past. We now move
everything, which has to do with ipl and reipl to a new header file named
"ipl.h".
Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/early.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/ipl.c | 24 | ||||
| -rw-r--r-- | arch/s390/kernel/setup.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/smp.c | 1 |
4 files changed, 5 insertions, 22 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index 011e8c7acc7e..5d02e48c72e0 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/pfn.h> #include <linux/uaccess.h> +#include <asm/ipl.h> #include <asm/lowcore.h> #include <asm/processor.h> #include <asm/sections.h> diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index 052259530651..a2410423c226 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/reboot.h> #include <linux/ctype.h> +#include <asm/ipl.h> #include <asm/smp.h> #include <asm/setup.h> #include <asm/cpcmd.h> @@ -94,27 +95,6 @@ static char *shutdown_action_str(enum shutdown_action action) } } -enum diag308_subcode { - DIAG308_IPL = 3, - DIAG308_DUMP = 4, - DIAG308_SET = 5, - DIAG308_STORE = 6, -}; - -enum diag308_ipl_type { - DIAG308_IPL_TYPE_FCP = 0, - DIAG308_IPL_TYPE_CCW = 2, -}; - -enum diag308_opt { - DIAG308_IPL_OPT_IPL = 0x10, - DIAG308_IPL_OPT_DUMP = 0x20, -}; - -enum diag308_rc { - DIAG308_RC_OK = 1, -}; - static int diag308_set_works = 0; static int reipl_capabilities = IPL_TYPE_UNKNOWN; @@ -134,7 +114,7 @@ static struct ipl_parameter_block *dump_block_ccw; static enum shutdown_action on_panic_action = SHUTDOWN_STOP; -static int diag308(unsigned long subcode, void *addr) +int diag308(unsigned long subcode, void *addr) { register unsigned long _addr asm("0") = (unsigned long) addr; register unsigned long _rc asm("1") = 0; diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 49567d8cd9a1..fced022dc58d 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -41,6 +41,7 @@ #include <linux/ctype.h> #include <linux/reboot.h> +#include <asm/ipl.h> #include <asm/uaccess.h> #include <asm/system.h> #include <asm/smp.h> diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 432deb2d9795..ecaa432a99f8 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -31,6 +31,7 @@ #include <linux/interrupt.h> #include <linux/cpu.h> #include <linux/timex.h> +#include <asm/ipl.h> #include <asm/setup.h> #include <asm/sigp.h> #include <asm/pgalloc.h> |
