diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-25 12:18:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-25 12:18:25 +1000 |
| commit | 94bacf450c4061c2a7cc4a197e0ffade3d650ad7 (patch) | |
| tree | 2f03131ee2e04fff1429bdf5af459da4578a4a0e /arch | |
| parent | f21c35a1ca3cfb785a58288205fb631b302288b9 (diff) | |
| parent | 7c5eec5d22485d7a74a75cd6efd43b2b9629d107 (diff) | |
Merge commit 's390/features'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/ipl.c | 5 | ||||
| -rw-r--r-- | arch/s390/lib/delay.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index 54b2779b5e2f..2dcf590faba6 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -1705,7 +1705,10 @@ void __init setup_ipl(void) void __init ipl_update_parameters(void) { - if (diag308(DIAG308_STORE, &ipl_block) == DIAG308_RC_OK) + int rc; + + rc = diag308(DIAG308_STORE, &ipl_block); + if ((rc == DIAG308_RC_OK) || (rc == DIAG308_RC_NOCONFIG)) diag308_set_works = 1; } diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c index eae21a8ac72d..fc6ab6094df8 100644 --- a/arch/s390/lib/delay.c +++ b/arch/s390/lib/delay.c @@ -43,7 +43,7 @@ void __udelay(unsigned long usecs) local_bh_disable(); local_irq_save(flags); if (raw_irqs_disabled_flags(flags)) { - old_cc = S390_lowcore.clock_comparator; + old_cc = local_tick_disable(); S390_lowcore.clock_comparator = -1ULL; __ctl_store(cr0, 0, 0); dummy = (cr0 & 0xffff00e0) | 0x00000800; @@ -65,7 +65,7 @@ void __udelay(unsigned long usecs) if (raw_irqs_disabled_flags(flags)) { __ctl_load(cr0, 0, 0); - S390_lowcore.clock_comparator = old_cc; + local_tick_enable(old_cc); } if (!irq_context) _local_bh_enable(); |