Y2038

y2038@lists.linaro.org

9 participants
1196 discussions

[PATCH v4] Staging: olpc_dcon: Replace timespec with ktime_t

by Ksenija Stanojevic

Struct timespec will overflow in year 2038, here it will not cause an overflow because it is used with timespec_sub, but still has to be removed as part of y2038 changes. Replace it with ktime_t. Also use monotonic instead of real-time by replacing functions getnstimeofday with ktime_get. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> --- Changes in v4: -fix checkpatch.pl errors/warnings introduced by changes made in v3. Changes in v3: -fix commit message (ktime_sub -> ktime_get) Changes in v2: -use ktime_t instead timespec64 -use ktime_sub instead timespec64_sub -use monotonic instead real-time. drivers/staging/olpc_dcon/olpc_dcon.c | 27 +++++++++++++-------------- drivers/staging/olpc_dcon/olpc_dcon.h | 4 ++-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index d115f5c..9038e0b 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c @@ -238,13 +238,12 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep) */ static void dcon_load_holdoff(struct dcon_priv *dcon) { - struct timespec delta_t, now; + ktime_t delta_t, now; while (1) { - getnstimeofday(&now); - delta_t = timespec_sub(now, dcon->load_time); - if (delta_t.tv_sec != 0 || - delta_t.tv_nsec > NSEC_PER_MSEC * 20) { + now = ktime_get(); + delta_t = ktime_sub(now, dcon->load_time); + if (ktime_to_ns(delta_t) > NSEC_PER_MSEC * 20) { break; } mdelay(4); @@ -325,19 +324,19 @@ static void dcon_source_switch(struct work_struct *work) /* And turn off the DCON */ pdata->set_dconload(1); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); pr_info("The CPU has control\n"); break; case DCON_SOURCE_DCON: { - struct timespec delta_t; + ktime_t delta_t; pr_info("dcon_source_switch to DCON\n"); /* Clear DCONLOAD - this implies that the DCON is in control */ pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); wait_event_timeout(dcon->waitq, dcon->switched, HZ/2); @@ -355,14 +354,14 @@ static void dcon_source_switch(struct work_struct *work) * deassert and reassert, and hope for the best. * see http://dev.laptop.org/ticket/9664 */ - delta_t = timespec_sub(dcon->irq_time, dcon->load_time); - if (dcon->switched && delta_t.tv_sec == 0 && - delta_t.tv_nsec < NSEC_PER_MSEC * 20) { + delta_t = ktime_sub(dcon->irq_time, dcon->load_time); + if (dcon->switched && ktime_to_ns(delta_t) + < NSEC_PER_MSEC * 20) { pr_err("missed loading, retrying\n"); pdata->set_dconload(1); mdelay(41); pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); mdelay(41); } } @@ -742,7 +741,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) case 2: /* switch to DCON mode */ case 1: /* switch to CPU mode */ dcon->switched = true; - getnstimeofday(&dcon->irq_time); + dcon->irq_time = ktime_get(); wake_up(&dcon->waitq); break; @@ -756,7 +755,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) */ if (dcon->curr_src != dcon->pending_src && !dcon->switched) { dcon->switched = true; - getnstimeofday(&dcon->irq_time); + dcon->irq_time = ktime_get(); wake_up(&dcon->waitq); pr_debug("switching w/ status 0/0\n"); } else { diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h index d06e19d..215e7ec 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.h +++ b/drivers/staging/olpc_dcon/olpc_dcon.h @@ -79,8 +79,8 @@ struct dcon_priv { /* Variables used during switches */ bool switched; - struct timespec irq_time; - struct timespec load_time; + ktime_t irq_time; + ktime_t load_time; /* Current output type; true == mono, false == color */ bool mono; -- 1.9.1

10 years, 8 months

Courier was unable to deliver the parcel, ID00297501

by FedEx SmartPost

Dear Customer, We could not deliver your item. Please, open email attachment to print shipment label. Yours faithfully, Herbert Higgins, FedEx Operation Manager.

10 years, 8 months

[PATCH v3] Staging: olpc_dcon: Replace timespec with ktime_t

by Ksenija Stanojevic

Struct timespec will overflow in year 2038, here it will not cause an overflow because it is used with timespec_sub, but still has to be removed as part of y2038 changes. Replace it with ktime_t. Also use monotonic instead of real-time by replacing functions getnstimeofday with ktime_get. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- Changes in v3: -fix commit message (ktime_sub -> ktime_get) Changes in v2: -use ktime_t instead timespec64 -use ktime_sub instead timespec64_sub -use monotonic instead real-time. drivers/staging/olpc_dcon/olpc_dcon.c | 27 +++++++++++++-------------- drivers/staging/olpc_dcon/olpc_dcon.h | 4 ++-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index d115f5c..2dc5d36 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c @@ -238,13 +238,12 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep) */ static void dcon_load_holdoff(struct dcon_priv *dcon) { - struct timespec delta_t, now; + ktime_t delta_t, now; while (1) { - getnstimeofday(&now); - delta_t = timespec_sub(now, dcon->load_time); - if (delta_t.tv_sec != 0 || - delta_t.tv_nsec > NSEC_PER_MSEC * 20) { + now = ktime_get(); + delta_t = ktime_sub(now, dcon->load_time); + if (ktime_to_ns(delta_t) > NSEC_PER_MSEC * 20) { break; } mdelay(4); @@ -325,19 +324,19 @@ static void dcon_source_switch(struct work_struct *work) /* And turn off the DCON */ pdata->set_dconload(1); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); pr_info("The CPU has control\n"); break; case DCON_SOURCE_DCON: { - struct timespec delta_t; + ktime_t delta_t; pr_info("dcon_source_switch to DCON\n"); /* Clear DCONLOAD - this implies that the DCON is in control */ pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); wait_event_timeout(dcon->waitq, dcon->switched, HZ/2); @@ -355,14 +354,14 @@ static void dcon_source_switch(struct work_struct *work) * deassert and reassert, and hope for the best. * see http://dev.laptop.org/ticket/9664 */ - delta_t = timespec_sub(dcon->irq_time, dcon->load_time); - if (dcon->switched && delta_t.tv_sec == 0 && - delta_t.tv_nsec < NSEC_PER_MSEC * 20) { + delta_t = ktime_sub(dcon->irq_time, dcon->load_time); + if (dcon->switched && + ktime_to_ns(delta_t) < NSEC_PER_MSEC * 20) { pr_err("missed loading, retrying\n"); pdata->set_dconload(1); mdelay(41); pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); mdelay(41); } } @@ -742,7 +741,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) case 2: /* switch to DCON mode */ case 1: /* switch to CPU mode */ dcon->switched = true; - getnstimeofday(&dcon->irq_time); + dcon->irq_time = ktime_get(); wake_up(&dcon->waitq); break; @@ -756,7 +755,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) */ if (dcon->curr_src != dcon->pending_src && !dcon->switched) { dcon->switched = true; - getnstimeofday(&dcon->irq_time); + dcon->irq_time = ktime_get(); wake_up(&dcon->waitq); pr_debug("switching w/ status 0/0\n"); } else { diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h index d06e19d..215e7ec 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.h +++ b/drivers/staging/olpc_dcon/olpc_dcon.h @@ -79,8 +79,8 @@ struct dcon_priv { /* Variables used during switches */ bool switched; - struct timespec irq_time; - struct timespec load_time; + ktime_t irq_time; + ktime_t load_time; /* Current output type; true == mono, false == color */ bool mono; -- 1.9.1

10 years, 8 months

[PATCH 0/5] y2038 conversion for ntp/pps and sfc driver

by Arnd Bergmann

When trying to build a kernel with time_t commented out, I found that the ntp subsystem still relies on timespec for its pps handling. This series addresses this and converts all the code to use timespec64 instead, step by step. There is one device driver that interacts with this code directly (rather than only through the ptp subsystem), so I have to convert that driver at the same time. The patches should ideally stay together as a series, but they do span multiple subsystems, so I'm also looking for the right person to merge them. Please review. Thanks, Arnd Arnd Bergmann (5): ntp/pps: use timespec64 for hardpps() ntp/pps: replace getnstime_raw_and_real with 64-bit version ntp: use timespec64 in sync_cmos_clock ntp/pps: use y2038 safe types in pps_event_time net: sfc: avoid using timespec drivers/net/ethernet/sfc/ptp.c | 30 +++++++++++++++--------------- drivers/pps/kapi.c | 4 ++-- include/linux/pps_kernel.h | 16 ++++++++-------- include/linux/timekeeping.h | 4 ++-- include/linux/timex.h | 2 +- kernel/time/ntp.c | 16 ++++++++-------- kernel/time/ntp_internal.h | 2 +- kernel/time/timekeeping.c | 14 +++++++------- 8 files changed, 44 insertions(+), 44 deletions(-) -- 2.1.0.rc2

10 years, 8 months

[PATCH] ceph: fix message length computation

by Arnd Bergmann

create_request_message() computes the maximum length of a message, but uses the wrong type for the time stamp: sizeof(struct timespec) may be 8 or 16 depending on the architecture, while sizeof(struct ceph_timespec) is always 8, and that is what gets put into the message. Found while auditing the uses of timespec for y2038 problems. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: b8e69066d8af ("ceph: include time stamp in every MDS request") --- diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 51cb02da75d9..fe2c982764e7 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -1935,7 +1935,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc, len = sizeof(*head) + pathlen1 + pathlen2 + 2*(1 + sizeof(u32) + sizeof(u64)) + - sizeof(struct timespec); + sizeof(struct ceph_timespec); /* calculate (max) length for cap releases */ len += sizeof(struct ceph_mds_request_release) *

10 years, 8 months

Courier was unable to deliver the parcel, ID00000967235

by FedEx 2Day

Dear Customer, We could not deliver your parcel. Shipment Label is attached to this email. Yours sincerely, Greg Weiss, Sr. Delivery Manager.

10 years, 8 months

[PATCH v2] Staging: olpc_dcon: Replace timespec with ktime_t

by Ksenija Stanojevic

Struct timespec will overflow in year 2038, here it will not cause an overflow because it is used with timespec_sub, but still has to be removed as part of y2038 changes. Replace it with ktime_t. Also use monotonic instead of real-time by replacing functions getnstimeofday with ktime_sub. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- Changes in v2: -use ktime_t instead timespec64 -use ktime_sub instead timespec64_sub -use monotonic instead real-time. drivers/staging/olpc_dcon/olpc_dcon.c | 27 +++++++++++++-------------- drivers/staging/olpc_dcon/olpc_dcon.h | 4 ++-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index d115f5c..2dc5d36 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c @@ -238,13 +238,12 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep) */ static void dcon_load_holdoff(struct dcon_priv *dcon) { - struct timespec delta_t, now; + ktime_t delta_t, now; while (1) { - getnstimeofday(&now); - delta_t = timespec_sub(now, dcon->load_time); - if (delta_t.tv_sec != 0 || - delta_t.tv_nsec > NSEC_PER_MSEC * 20) { + now = ktime_get(); + delta_t = ktime_sub(now, dcon->load_time); + if (ktime_to_ns(delta_t) > NSEC_PER_MSEC * 20) { break; } mdelay(4); @@ -325,19 +324,19 @@ static void dcon_source_switch(struct work_struct *work) /* And turn off the DCON */ pdata->set_dconload(1); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); pr_info("The CPU has control\n"); break; case DCON_SOURCE_DCON: { - struct timespec delta_t; + ktime_t delta_t; pr_info("dcon_source_switch to DCON\n"); /* Clear DCONLOAD - this implies that the DCON is in control */ pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); wait_event_timeout(dcon->waitq, dcon->switched, HZ/2); @@ -355,14 +354,14 @@ static void dcon_source_switch(struct work_struct *work) * deassert and reassert, and hope for the best. * see http://dev.laptop.org/ticket/9664 */ - delta_t = timespec_sub(dcon->irq_time, dcon->load_time); - if (dcon->switched && delta_t.tv_sec == 0 && - delta_t.tv_nsec < NSEC_PER_MSEC * 20) { + delta_t = ktime_sub(dcon->irq_time, dcon->load_time); + if (dcon->switched && + ktime_to_ns(delta_t) < NSEC_PER_MSEC * 20) { pr_err("missed loading, retrying\n"); pdata->set_dconload(1); mdelay(41); pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + dcon->load_time = ktime_get(); mdelay(41); } } @@ -742,7 +741,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) case 2: /* switch to DCON mode */ case 1: /* switch to CPU mode */ dcon->switched = true; - getnstimeofday(&dcon->irq_time); + dcon->irq_time = ktime_get(); wake_up(&dcon->waitq); break; @@ -756,7 +755,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) */ if (dcon->curr_src != dcon->pending_src && !dcon->switched) { dcon->switched = true; - getnstimeofday(&dcon->irq_time); + dcon->irq_time = ktime_get(); wake_up(&dcon->waitq); pr_debug("switching w/ status 0/0\n"); } else { diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h index d06e19d..215e7ec 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.h +++ b/drivers/staging/olpc_dcon/olpc_dcon.h @@ -79,8 +79,8 @@ struct dcon_priv { /* Variables used during switches */ bool switched; - struct timespec irq_time; - struct timespec load_time; + ktime_t irq_time; + ktime_t load_time; /* Current output type; true == mono, false == color */ bool mono; -- 1.9.1

10 years, 8 months

[PATCH] Staging: wilc1000: Remove typedef

by Ksenija Stanojevic

WILC_Time is not used and also time_t is not y2038 safe, therefore remove it. Also remove comment refering to it. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- drivers/staging/wilc1000/wilc_platform.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h index 1e56973..83f309d 100644 --- a/drivers/staging/wilc1000/wilc_platform.h +++ b/drivers/staging/wilc1000/wilc_platform.h @@ -33,8 +33,6 @@ typedef struct __MessageQueue_struct { -/*Time represented in 64 bit format*/ -typedef time_t WILC_Time; /******************************************************************* -- 1.9.1

10 years, 8 months

[PATCH] Staging: olpc_dcon: Replace timespec with timespec64

by Ksenija Stanojevic

Struct timespec will overflow in year 2038, therefore relace it with struct timespec64. Also replace functions getnstimeofday and timespec_sub, which uses struct timespec, with getnstimeofday64 and timespec64_sub. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- drivers/staging/olpc_dcon/olpc_dcon.c | 21 +++++++++++---------- drivers/staging/olpc_dcon/olpc_dcon.h | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index d115f5c..227ae0d 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c @@ -238,11 +238,11 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep) */ static void dcon_load_holdoff(struct dcon_priv *dcon) { - struct timespec delta_t, now; + struct timespec64 delta_t, now; while (1) { - getnstimeofday(&now); - delta_t = timespec_sub(now, dcon->load_time); + getnstimeofday64(&now); + delta_t = timespec64_sub(now, dcon->load_time); if (delta_t.tv_sec != 0 || delta_t.tv_nsec > NSEC_PER_MSEC * 20) { break; @@ -325,19 +325,19 @@ static void dcon_source_switch(struct work_struct *work) /* And turn off the DCON */ pdata->set_dconload(1); - getnstimeofday(&dcon->load_time); + getnstimeofday64(&dcon->load_time); pr_info("The CPU has control\n"); break; case DCON_SOURCE_DCON: { - struct timespec delta_t; + struct timespec64 delta_t; pr_info("dcon_source_switch to DCON\n"); /* Clear DCONLOAD - this implies that the DCON is in control */ pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + getnstimeofday64(&dcon->load_time); wait_event_timeout(dcon->waitq, dcon->switched, HZ/2); @@ -355,14 +355,15 @@ static void dcon_source_switch(struct work_struct *work) * deassert and reassert, and hope for the best. * see http://dev.laptop.org/ticket/9664 */ - delta_t = timespec_sub(dcon->irq_time, dcon->load_time); + delta_t = timespec64_sub(dcon->irq_time, + dcon->load_time); if (dcon->switched && delta_t.tv_sec == 0 && delta_t.tv_nsec < NSEC_PER_MSEC * 20) { pr_err("missed loading, retrying\n"); pdata->set_dconload(1); mdelay(41); pdata->set_dconload(0); - getnstimeofday(&dcon->load_time); + getnstimeofday64(&dcon->load_time); mdelay(41); } } @@ -742,7 +743,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) case 2: /* switch to DCON mode */ case 1: /* switch to CPU mode */ dcon->switched = true; - getnstimeofday(&dcon->irq_time); + getnstimeofday64(&dcon->irq_time); wake_up(&dcon->waitq); break; @@ -756,7 +757,7 @@ irqreturn_t dcon_interrupt(int irq, void *id) */ if (dcon->curr_src != dcon->pending_src && !dcon->switched) { dcon->switched = true; - getnstimeofday(&dcon->irq_time); + getnstimeofday64(&dcon->irq_time); wake_up(&dcon->waitq); pr_debug("switching w/ status 0/0\n"); } else { diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h index d06e19d..ccb500b 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.h +++ b/drivers/staging/olpc_dcon/olpc_dcon.h @@ -79,8 +79,8 @@ struct dcon_priv { /* Variables used during switches */ bool switched; - struct timespec irq_time; - struct timespec load_time; + struct timespec64 irq_time; + struct timespec64 load_time; /* Current output type; true == mono, false == color */ bool mono; -- 1.9.1

10 years, 8 months

[PATCH] Staging: fbtbt: Replace timespec with timespec64

by Ksenija Stanojevic

struct timespec will overflow in year 2038, so replace it with timespec64. And replace functions that use struct timespec, timespec_sub with timespec64_sub and getnstimeofday with getnstimeofday64. Also use parameters to convert the timespec64 values instead of hard code. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- drivers/staging/fbtft/fbtft-core.c | 26 +++++++++++++------------- drivers/staging/fbtft/fbtft.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 23392eb..3e4eeac 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -365,16 +365,16 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line, unsigned end_line) { size_t offset, len; - struct timespec ts_start, ts_end, ts_fps, ts_duration; + struct timespec64 ts_start, ts_end, ts_fps, ts_duration; long fps_ms, fps_us, duration_ms, duration_us; - long fps, throughput; + long long fps, throughput; bool timeit = false; int ret = 0; if (unlikely(par->debug & (DEBUG_TIME_FIRST_UPDATE | DEBUG_TIME_EACH_UPDATE))) { if ((par->debug & DEBUG_TIME_EACH_UPDATE) || ((par->debug & DEBUG_TIME_FIRST_UPDATE) && !par->first_update_done)) { - getnstimeofday(&ts_start); + getnstimeofday64(&ts_start); timeit = true; } } @@ -411,28 +411,28 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line, __func__); if (unlikely(timeit)) { - getnstimeofday(&ts_end); + getnstimeofday64(&ts_end); if (par->update_time.tv_nsec == 0 && par->update_time.tv_sec == 0) { par->update_time.tv_sec = ts_start.tv_sec; par->update_time.tv_nsec = ts_start.tv_nsec; } - ts_fps = timespec_sub(ts_start, par->update_time); + ts_fps = timespec64_sub(ts_start, par->update_time); par->update_time.tv_sec = ts_start.tv_sec; par->update_time.tv_nsec = ts_start.tv_nsec; - fps_ms = (ts_fps.tv_sec * 1000) + ((ts_fps.tv_nsec / 1000000) % 1000); - fps_us = (ts_fps.tv_nsec / 1000) % 1000; - fps = fps_ms * 1000 + fps_us; + fps_ms = (ts_fps.tv_sec * MSEC_PER_SEC) + (ts_fps.tv_nsec / NSEC_PER_MSEC); + fps_us = ts_fps.tv_nsec / NSEC_PER_USEC; + fps = fps_ms * USEC_PER_MSEC + fps_us; fps = fps ? 1000000 / fps : 0; - ts_duration = timespec_sub(ts_end, ts_start); - duration_ms = (ts_duration.tv_sec * 1000) + ((ts_duration.tv_nsec / 1000000) % 1000); - duration_us = (ts_duration.tv_nsec / 1000) % 1000; - throughput = duration_ms * 1000 + duration_us; + ts_duration = timespec64_sub(ts_end, ts_start); + duration_ms = (ts_duration.tv_sec * MSEC_PER_SEC) + (ts_duration.tv_nsec / NSEC_PER_MSEC); + duration_us = ts_duration.tv_nsec / NSEC_PER_USEC; + throughput = duration_ms * USEC_PER_MSEC + duration_us; throughput = throughput ? (len * 1000) / throughput : 0; throughput = throughput * 1000 / 1024; dev_info(par->info->device, - "Display update: %ld kB/s (%ld.%.3ld ms), fps=%ld (%ld.%.3ld ms)\n", + "Display update: %lld kB/s (%ld.%.3ld ms), fps=%lld (%ld.%.3ld ms)\n", throughput, duration_ms, duration_us, fps, fps_ms, fps_us); par->first_update_done = true; diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 7e9a506..bf4c358 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -251,7 +251,7 @@ struct fbtft_par { } gamma; unsigned long debug; bool first_update_done; - struct timespec update_time; + struct timespec64 update_time; bool bgr; void *extra; }; -- 1.9.1

10 years, 8 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038