Skip to content

Commit 03780c8

Browse files
svens-s390hcahca
authored andcommitted
s390/stp: fix todoff size
The size of the TOD offset field in the stp info response is 64 bits. Signed-off-by: Sven Schnelle <[email protected]> Reviewed-by: Heiko Carstens <[email protected]> Signed-off-by: Heiko Carstens <[email protected]>
1 parent 39d6233 commit 03780c8

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

arch/s390/include/asm/stp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ struct stp_sstpi {
4444
u32 : 32;
4545
u32 ctnid[3];
4646
u32 : 32;
47-
u32 todoff[4];
48-
u32 rsvd[48];
47+
u64 todoff;
48+
u32 rsvd[50];
4949
} __packed;
5050

5151
struct stp_tzib {

arch/s390/kernel/time.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,7 @@ static int stp_sync_clock(void *data)
554554
while (atomic_read(&sync->cpus) != 0)
555555
cpu_relax();
556556
rc = 0;
557-
if (stp_info.todoff[0] || stp_info.todoff[1] ||
558-
stp_info.todoff[2] || stp_info.todoff[3] ||
559-
stp_info.tmd != 2) {
557+
if (stp_info.todoff || stp_info.tmd != 2) {
560558
flags = vdso_update_begin();
561559
rc = chsc_sstpc(stp_page, STP_OP_SYNC, 0,
562560
&clock_delta);

0 commit comments

Comments
 (0)