diff --git a/[refs] b/[refs] index b86d278a451f..fd260845e663 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 408aec3c6c3cb5b4774f96ea7a35cd15ee91a56f +refs/heads/master: 4a672cfa3a7fcbc6f2adc558f34148be1096c561 diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index 06acb1a18bbc..b94e9e3b694a 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -1356,7 +1356,7 @@ static void __init stp_reset(void) stp_page = alloc_bootmem_pages(PAGE_SIZE); rc = chsc_sstpc(stp_page, STP_OP_CTRL, 0x0000); - if (rc == 1) + if (rc == 0) set_bit(CLOCK_SYNC_HAS_STP, &clock_sync_flags); else if (stp_online) { printk(KERN_WARNING "Running on non STP capable machine.\n");