public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@suse.de>,
	"Arve Hjønnevåg" <arve@android.com>,
	"Mike Lockwood" <lockwood@android.com>
Subject: [PATCH 05/10] Staging: android: fix build error on 64bit boxes
Date: Wed, 28 Jan 2009 15:26:45 -0800	[thread overview]
Message-ID: <1233185210-23098-5-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20090128232319.GA23009@kroah.com>

ktime_t isn't ment to directly access on all arches, so use the proper
conversion functions instead to figure out what time is remaining.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Mike Lockwood <lockwood@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/android/timed_gpio.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c
index b41b20e..903270c 100644
--- a/drivers/staging/android/timed_gpio.c
+++ b/drivers/staging/android/timed_gpio.c
@@ -49,7 +49,8 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *att
 
 	if (hrtimer_active(&gpio_data->timer)) {
 		ktime_t r = hrtimer_get_remaining(&gpio_data->timer);
-		remaining = r.tv.sec * 1000 + r.tv.nsec / 1000000;
+		struct timeval t = ktime_to_timeval(r);
+		remaining = t.tv_sec * 1000 + t.tv_usec;
 	} else
 		remaining = 0;
 
-- 
1.6.0.2


  parent reply	other threads:[~2009-01-28 23:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-28 23:23 [GIT PATCH] STAGING patches for 2.6-git Greg KH
2009-01-28 23:26 ` [PATCH 01/10] Staging: comedi: fix Kbuild Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 02/10] Staging: meilhaus: " Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 03/10] Staging: android: binder: fix arm build errors Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 04/10] Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25 Greg Kroah-Hartman
2009-01-28 23:26 ` Greg Kroah-Hartman [this message]
2009-01-28 23:26 ` [PATCH 06/10] Staging: android: Add lowmemorykiller documentation Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 07/10] Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 08/10] staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h> Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 09/10] Staging: usbip: usbip_start_threads(): handle kernel_thread failure Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 10/10] Staging: poch: fix verification of memory area Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1233185210-23098-5-git-send-email-gregkh@suse.de \
    --to=gregkh@suse.de \
    --cc=arve@android.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lockwood@android.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox