Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / eeh_pe.c

diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index 2e8d1b2b5af4571132c38593ef1ca160347efecf..2d4956e97aa9812fd93863322e1a1808e5a54cd7 100644 (file)
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -526,16 +526,16 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev)
  */
 void eeh_pe_update_time_stamp(struct eeh_pe *pe)
 {
-       struct timeval tstamp;
+       time64_t tstamp;
 
        if (!pe) return;
 
        if (pe->freeze_count <= 0) {
                pe->freeze_count = 0;
-               do_gettimeofday(&pe->tstamp);
+               pe->tstamp = ktime_get_seconds();
        } else {
-               do_gettimeofday(&tstamp);
-               if (tstamp.tv_sec - pe->tstamp.tv_sec > 3600) {
+               tstamp = ktime_get_seconds();
+               if (tstamp - pe->tstamp > 3600) {
                        pe->tstamp = tstamp;
                        pe->freeze_count = 0;
                }