From f73d72d73d65b97573bdcd43d5483d0413714835 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 16 Oct 2012 16:40:53 +1000 Subject: [PATCH] --- yaml --- r: 334411 b: refs/heads/master c: 8a00b6af4cc547725f231c8367ddc7cb56b2cf76 h: refs/heads/master i: 334409: 1cf90fea5995932f9f76b877fba8257244426413 334407: 79983a57dd893fc697f48cba987e0d71dd62a5ab v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7e68543904a2..639517c5a0f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b +refs/heads/master: 8a00b6af4cc547725f231c8367ddc7cb56b2cf76 diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c index b29237970fa0..523178685180 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c @@ -134,7 +134,7 @@ nouveau_therm_fan_sense(struct nouveau_therm *therm) end = ptimer->read(ptimer); if (cycles == 5) { - tach = (u64)60000000000; + tach = (u64)60000000000ULL; do_div(tach, (end - start)); return tach; } else