projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs/eventfd.c should #include <linux/syscalls.h>
[powerpc.git]
/
kernel
/
hrtimer.c
diff --git
a/kernel/hrtimer.c
b/kernel/hrtimer.c
index
1069998
..
668f396
100644
(file)
--- a/
kernel/hrtimer.c
+++ b/
kernel/hrtimer.c
@@
-306,7
+306,7
@@
EXPORT_SYMBOL_GPL(ktime_sub_ns);
/*
* Divide a ktime value by a nanosecond value
*/
/*
* Divide a ktime value by a nanosecond value
*/
-u
nsigned long
ktime_divns(const ktime_t kt, s64 div)
+u
64
ktime_divns(const ktime_t kt, s64 div)
{
u64 dclc, inc, dns;
int sft = 0;
{
u64 dclc, inc, dns;
int sft = 0;
@@
-321,7
+321,7
@@
unsigned long ktime_divns(const ktime_t kt, s64 div)
dclc >>= sft;
do_div(dclc, (unsigned long) div);
dclc >>= sft;
do_div(dclc, (unsigned long) div);
- return
(unsigned long)
dclc;
+ return dclc;
}
#endif /* BITS_PER_LONG >= 64 */
}
#endif /* BITS_PER_LONG >= 64 */
@@
-656,10
+656,9
@@
void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags)
* Forward the timer expiry so it will expire in the future.
* Returns the number of overruns.
*/
* Forward the timer expiry so it will expire in the future.
* Returns the number of overruns.
*/
-unsigned long
-hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
+u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
{
{
- u
nsigned long
orun = 1;
+ u
64
orun = 1;
ktime_t delta;
delta = ktime_sub(now, timer->expires);
ktime_t delta;
delta = ktime_sub(now, timer->expires);