Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
e00b99de
Commit
e00b99de
authored
Feb 14, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix futex compile breakage introduced by the compat code.
parent
a428a69e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
kernel/fork.c
kernel/fork.c
+2
-2
kernel/futex.c
kernel/futex.c
+2
-3
No files found.
kernel/fork.c
View file @
e00b99de
...
@@ -427,7 +427,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
...
@@ -427,7 +427,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
complete
(
vfork_done
);
complete
(
vfork_done
);
}
}
if
(
tsk
->
clear_child_tid
&&
atomic_read
(
&
mm
->
mm_users
)
>
1
)
{
if
(
tsk
->
clear_child_tid
&&
atomic_read
(
&
mm
->
mm_users
)
>
1
)
{
int
*
tidptr
=
tsk
->
clear_child_tid
;
u32
*
tidptr
=
tsk
->
clear_child_tid
;
tsk
->
clear_child_tid
=
NULL
;
tsk
->
clear_child_tid
=
NULL
;
/*
/*
...
@@ -435,7 +435,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
...
@@ -435,7 +435,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
* not set up a proper pointer then tough luck.
* not set up a proper pointer then tough luck.
*/
*/
put_user
(
0
,
tidptr
);
put_user
(
0
,
tidptr
);
sys_futex
(
(
unsigned
long
)
tidptr
,
FUTEX_WAKE
,
1
,
NULL
);
sys_futex
(
tidptr
,
FUTEX_WAKE
,
1
,
NULL
);
}
}
}
}
...
...
kernel/futex.c
View file @
e00b99de
...
@@ -420,7 +420,7 @@ static int futex_fd(unsigned long uaddr, int offset, int signal)
...
@@ -420,7 +420,7 @@ static int futex_fd(unsigned long uaddr, int offset, int signal)
return
ret
;
return
ret
;
}
}
long
do_futex
(
unsigned
long
uaddr
,
int
op
,
int
val
,
unsi
ng
ed
long
timeout
)
long
do_futex
(
unsigned
long
uaddr
,
int
op
,
int
val
,
unsi
gn
ed
long
timeout
)
{
{
unsigned
long
pos_in_page
;
unsigned
long
pos_in_page
;
int
ret
;
int
ret
;
...
@@ -453,11 +453,10 @@ asmlinkage long sys_futex(u32 *uaddr, int op, int val, struct timespec *utime)
...
@@ -453,11 +453,10 @@ asmlinkage long sys_futex(u32 *uaddr, int op, int val, struct timespec *utime)
struct
timespec
t
;
struct
timespec
t
;
unsigned
long
timeout
=
MAX_SCHEDULE_TIMEOUT
;
unsigned
long
timeout
=
MAX_SCHEDULE_TIMEOUT
;
if
((
op
==
FUTEX_WAIT
)
&&
utime
)
{
if
((
op
==
FUTEX_WAIT
)
&&
utime
)
{
if
(
copy_from_user
(
&
t
,
utime
,
sizeof
(
t
))
!=
0
)
if
(
copy_from_user
(
&
t
,
utime
,
sizeof
(
t
))
!=
0
)
return
-
EFAULT
;
return
-
EFAULT
;
timeout
=
timespec_to_jiffies
(
t
)
+
1
;
timeout
=
timespec_to_jiffies
(
&
t
)
+
1
;
}
}
return
do_futex
((
unsigned
long
)
uaddr
,
op
,
val
,
timeout
);
return
do_futex
((
unsigned
long
)
uaddr
,
op
,
val
,
timeout
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment