2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
index 1afe90ade595..bbc06bd72b1f 100644
--- a/arch/powerpc/include/asm/vdso_datapage.h
+++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -82,10 +82,10 @@ struct vdso_data {
        __u32 icache_block_size;                /* L1 i-cache block size     */
        __u32 dcache_log_block_size;            /* L1 d-cache log block size */
        __u32 icache_log_block_size;            /* L1 i-cache log block size */
-        __s32 wtom_clock_sec;                   /* Wall to monotonic clock */
+        __u32 stamp_sec_fraction;               /* fractional seconds of stamp_xtime */
-        __s32 wtom_clock_nsec;
+        __s32 wtom_clock_nsec;                  /* Wall to monotonic clock nsec */
-        struct timespec stamp_xtime;    /* xtime as at tb_orig_stamp */
+        __s64 wtom_clock_sec;                   /* Wall to monotonic clock sec */
-        __u32 stamp_sec_fraction;       /* fractional seconds of stamp_xtime */
+        struct timespec stamp_xtime;            /* xtime as at tb_orig_stamp */
        __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls  */
        __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
 };
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S
index a4ed9edfd5f0..1f324c28705b 100644
--- a/arch/powerpc/kernel/vdso64/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso64/gettimeofday.S
@@ -92,7 +92,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
         * At this point, r4,r5 contain our sec/nsec values.
         */
-        lwa     r6,WTOM_CLOCK_SEC(r3)
+        ld      r6,WTOM_CLOCK_SEC(r3)
        lwa     r9,WTOM_CLOCK_NSEC(r3)
        /* We now have our result in r6,r9. We create a fake dependency
@@ -125,7 +125,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
        bne     cr6,75f
        /* CLOCK_MONOTONIC_COARSE */
-        lwa     r6,WTOM_CLOCK_SEC(r3)
+        ld      r6,WTOM_CLOCK_SEC(r3)
        lwa     r9,WTOM_CLOCK_NSEC(r3)
        /* check if counter has updated */

diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h index 1afe90ade595..bbc06bd72b1f 100644 --- a/arch/powerpc/include/asm/vdso_datapage.h +++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -82,10 +82,10 @@ struct vdso_data {
82	__u32 icache_block_size; /* L1 i-cache block size */	82	__u32 icache_block_size; /* L1 i-cache block size */
83	__u32 dcache_log_block_size; /* L1 d-cache log block size */	83	__u32 dcache_log_block_size; /* L1 d-cache log block size */
84	__u32 icache_log_block_size; /* L1 i-cache log block size */	84	__u32 icache_log_block_size; /* L1 i-cache log block size */
85	__s32 wtom_clock_sec; /* Wall to monotonic clock */	85	__u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */
86	__s32 wtom_clock_nsec;	86	__s32 wtom_clock_nsec; /* Wall to monotonic clock nsec */
87	struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */	87	__s64 wtom_clock_sec; /* Wall to monotonic clock sec */
88	__u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */	88	struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */
89	__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */	89	__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */
90	__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */	90	__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
91	};	91	};


diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index a4ed9edfd5f0..1f324c28705b 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S
@@ -92,7 +92,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
92	* At this point, r4,r5 contain our sec/nsec values.	92	* At this point, r4,r5 contain our sec/nsec values.
93	*/	93	*/
94		94
95	lwa r6,WTOM_CLOCK_SEC(r3)	95	ld r6,WTOM_CLOCK_SEC(r3)
96	lwa r9,WTOM_CLOCK_NSEC(r3)	96	lwa r9,WTOM_CLOCK_NSEC(r3)
97		97
98	/* We now have our result in r6,r9. We create a fake dependency	98	/* We now have our result in r6,r9. We create a fake dependency
@@ -125,7 +125,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
125	bne cr6,75f	125	bne cr6,75f
126		126
127	/* CLOCK_MONOTONIC_COARSE */	127	/* CLOCK_MONOTONIC_COARSE */
128	lwa r6,WTOM_CLOCK_SEC(r3)	128	ld r6,WTOM_CLOCK_SEC(r3)
129	lwa r9,WTOM_CLOCK_NSEC(r3)	129	lwa r9,WTOM_CLOCK_NSEC(r3)
130		130
131	/* check if counter has updated */	131	/* check if counter has updated */