diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:21 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:21 -0500 |
commit | b0a71c3b397b12db727ce483f01b3336160ef6a1 (patch) | |
tree | 7ee48415239830c788ce4438624c39f6041b3963 /pc-bios/s390-ccw/s390-ccw.h | |
parent | f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4 (diff) | |
parent | 867b18db2155c0c99ab767c4ac563e144c85871d (diff) |
Merge remote-tracking branch 'agraf/s390-for-upstream' into staging
# By Alexander Graf (1) and others
# Via Alexander Graf
* agraf/s390-for-upstream:
s390: update s390-ccw.img
s390/ipl: Fix boot order
s390/IPL: Allow boot from other ssid than 0
Message-id: 1375092324-23943-1-git-send-email-agraf@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'pc-bios/s390-ccw/s390-ccw.h')
-rw-r--r-- | pc-bios/s390-ccw/s390-ccw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h index 8241b0af05..5e871ac84c 100644 --- a/pc-bios/s390-ccw/s390-ccw.h +++ b/pc-bios/s390-ccw/s390-ccw.h @@ -61,6 +61,7 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, bool virtio_is_blk(struct subchannel_id schid); void virtio_setup_block(struct subchannel_id schid); int virtio_read(ulong sector, void *load_addr); +int enable_mss_facility(void); /* bootmap.c */ int zipl_load(void); |