diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-04-14 09:36:28 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-04-14 09:37:27 -0400 |
commit | b6112ccbff5ec580d46b584ecc3c3a773b830da2 (patch) | |
tree | 71553f09a2acfedec85f3c29a1c65e0a257001fb /arch/s390/kernel/head.S | |
parent | 5b409ed17bb32c8316b1f456466c70529454573a (diff) |
[S390] add read_persistent_clock
Add a read_persistent_clock function that does not just return 0.
Since timekeeping_init calls the function before time_init has been
called move reset_tod_clock to early.c to make sure that the TOD
clock is running when read_persistent_clock is invoked.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/head.S')
-rw-r--r-- | arch/s390/kernel/head.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 1046c2c9f8d1..16f8975325ed 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
@@ -471,6 +471,8 @@ startup:basr %r13,0 # get base | |||
471 | .LPG0: | 471 | .LPG0: |
472 | xc 0x200(256),0x200 # partially clear lowcore | 472 | xc 0x200(256),0x200 # partially clear lowcore |
473 | xc 0x300(256),0x300 | 473 | xc 0x300(256),0x300 |
474 | l %r1,5f-.LPG0(%r13) | ||
475 | stck 0(%r1) | ||
474 | 476 | ||
475 | #ifndef CONFIG_MARCH_G5 | 477 | #ifndef CONFIG_MARCH_G5 |
476 | # check processor version against MARCH_{G5,Z900,Z990,Z9_109,Z10} | 478 | # check processor version against MARCH_{G5,Z900,Z990,Z9_109,Z10} |
@@ -496,9 +498,10 @@ startup:basr %r13,0 # get base | |||
496 | brct %r0,0b | 498 | brct %r0,0b |
497 | #endif | 499 | #endif |
498 | 500 | ||
499 | l %r13,0f-.LPG0(%r13) | 501 | l %r13,4f-.LPG0(%r13) |
500 | b 0(%r13) | 502 | b 0(%r13) |
501 | 0: .long startup_continue | 503 | 4: .long startup_continue |
504 | 5: .long sched_clock_base_cc | ||
502 | 505 | ||
503 | # | 506 | # |
504 | # params at 10400 (setup.h) | 507 | # params at 10400 (setup.h) |