diff options
Diffstat (limited to 'drivers/s390/cio/cio.c')
-rw-r--r-- | drivers/s390/cio/cio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index ad2b37929848..23e71a76cdab 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
@@ -895,11 +895,11 @@ static int stsch_reset(struct subchannel_id schid, volatile struct schib *addr) | |||
895 | int rc; | 895 | int rc; |
896 | 896 | ||
897 | pgm_check_occured = 0; | 897 | pgm_check_occured = 0; |
898 | s390_reset_pgm_handler = cio_reset_pgm_check_handler; | 898 | s390_base_pgm_handler_fn = cio_reset_pgm_check_handler; |
899 | rc = stsch(schid, addr); | 899 | rc = stsch(schid, addr); |
900 | s390_reset_pgm_handler = NULL; | 900 | s390_base_pgm_handler_fn = NULL; |
901 | 901 | ||
902 | /* The program check handler could have changed pgm_check_occured */ | 902 | /* The program check handler could have changed pgm_check_occured. */ |
903 | barrier(); | 903 | barrier(); |
904 | 904 | ||
905 | if (pgm_check_occured) | 905 | if (pgm_check_occured) |
@@ -957,7 +957,7 @@ static void css_reset(void) | |||
957 | /* Reset subchannels. */ | 957 | /* Reset subchannels. */ |
958 | for_each_subchannel(__shutdown_subchannel_easy, NULL); | 958 | for_each_subchannel(__shutdown_subchannel_easy, NULL); |
959 | /* Reset channel paths. */ | 959 | /* Reset channel paths. */ |
960 | s390_reset_mcck_handler = s390_reset_chpids_mcck_handler; | 960 | s390_base_mcck_handler_fn = s390_reset_chpids_mcck_handler; |
961 | /* Enable channel report machine checks. */ | 961 | /* Enable channel report machine checks. */ |
962 | __ctl_set_bit(14, 28); | 962 | __ctl_set_bit(14, 28); |
963 | /* Temporarily reenable machine checks. */ | 963 | /* Temporarily reenable machine checks. */ |
@@ -982,7 +982,7 @@ static void css_reset(void) | |||
982 | local_mcck_disable(); | 982 | local_mcck_disable(); |
983 | /* Disable channel report machine checks. */ | 983 | /* Disable channel report machine checks. */ |
984 | __ctl_clear_bit(14, 28); | 984 | __ctl_clear_bit(14, 28); |
985 | s390_reset_mcck_handler = NULL; | 985 | s390_base_mcck_handler_fn = NULL; |
986 | } | 986 | } |
987 | 987 | ||
988 | static struct reset_call css_reset_call = { | 988 | static struct reset_call css_reset_call = { |