git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Don't spin on sync instruction at boot time
[safe/jmp/linux-2.6]
/
fs
/
aio.c
diff --git
a/fs/aio.c
b/fs/aio.c
index
99c2352
..
0fb3117
100644
(file)
--- a/
fs/aio.c
+++ b/
fs/aio.c
@@
-591,10
+591,6
@@
static void use_mm(struct mm_struct *mm)
atomic_inc(&mm->mm_count);
tsk->mm = mm;
tsk->active_mm = mm;
atomic_inc(&mm->mm_count);
tsk->mm = mm;
tsk->active_mm = mm;
- /*
- * Note that on UML this *requires* PF_BORROWED_MM to be set, otherwise
- * it won't work. Update it accordingly if you change it here
- */
switch_mm(active_mm, mm, tsk);
task_unlock(tsk);
switch_mm(active_mm, mm, tsk);
task_unlock(tsk);
@@
-1078,9
+1074,7
@@
static void timeout_func(unsigned long data)
static inline void init_timeout(struct aio_timeout *to)
{
static inline void init_timeout(struct aio_timeout *to)
{
- init_timer(&to->timer);
- to->timer.data = (unsigned long)to;
- to->timer.function = timeout_func;
+ setup_timer_on_stack(&to->timer, timeout_func, (unsigned long) to);
to->timed_out = 0;
to->p = current;
}
to->timed_out = 0;
to->p = current;
}
@@
-1213,6
+1207,7
@@
retry:
if (timeout)
clear_timeout(&to);
out:
if (timeout)
clear_timeout(&to);
out:
+ destroy_timer_on_stack(&to.timer);
return i ? i : ret;
}
return i ? i : ret;
}