git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
include
/
asm-s390
/
ipl.h
diff --git
a/include/asm-s390/ipl.h
b/include/asm-s390/ipl.h
index bdcd448d43fb86518f5edb2d0eca000a1333129d..c1b2e50392bb095dcba90a0b797133eb4583e2c1 100644
(file)
--- a/
include/asm-s390/ipl.h
+++ b/
include/asm-s390/ipl.h
@@
-79,10
+79,12
@@
struct ipl_parameter_block {
* IPL validity flags
*/
extern u32 ipl_flags;
* IPL validity flags
*/
extern u32 ipl_flags;
-
extern u32 dump_prefix_page;
extern u32 dump_prefix_page;
+extern unsigned int zfcpdump_prefix_array[];
extern void do_reipl(void);
extern void do_reipl(void);
+extern void do_halt(void);
+extern void do_poff(void);
extern void ipl_save_parameters(void);
enum {
extern void ipl_save_parameters(void);
enum {
@@
-118,7
+120,7
@@
struct ipl_info
};
extern struct ipl_info ipl_info;
};
extern struct ipl_info ipl_info;
-extern void setup_ipl
_info
(void);
+extern void setup_ipl(void);
/*
* DIAG 308 support
/*
* DIAG 308 support
@@
-141,6
+143,10
@@
enum diag308_opt {
DIAG308_IPL_OPT_DUMP = 0x20,
};
DIAG308_IPL_OPT_DUMP = 0x20,
};
+enum diag308_flags {
+ DIAG308_FLAGS_LP_VALID = 0x80,
+};
+
enum diag308_rc {
DIAG308_RC_OK = 1,
};
enum diag308_rc {
DIAG308_RC_OK = 1,
};