Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18703
b: refs/heads/master
c: ea13dbc
h: refs/heads/master
i:
  18701: 8f6315c
  18699: 21967c4
  18695: 061fda8
  18687: f6446ab
v: v3
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Jan 17, 2006
1 parent 52902bb commit 4c506bd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d669af9d5afb5bdb629f78d024b35e507465f570
refs/heads/master: ea13dbc89caecd982500894d4238766a6bd3c8f4
3 changes: 2 additions & 1 deletion trunk/kernel/hrtimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,8 @@ schedule_hrtimer_interruptible(struct hrtimer *timer,
static long __sched
nanosleep_restart(struct restart_block *restart, clockid_t clockid)
{
struct timespec __user *rmtp, tu;
struct timespec __user *rmtp;
struct timespec tu;
void *rfn_save = restart->fn;
struct hrtimer timer;
ktime_t rem;
Expand Down

0 comments on commit 4c506bd

Please sign in to comment.