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
Kirill Smelkov
linux
Commits
bb37b84a
Commit
bb37b84a
authored
May 20, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
da94c7b2
68494a35
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
29 deletions
+21
-29
arch/alpha/kernel/process.c
arch/alpha/kernel/process.c
+4
-9
arch/alpha/kernel/ptrace.c
arch/alpha/kernel/ptrace.c
+7
-7
arch/alpha/kernel/smp.c
arch/alpha/kernel/smp.c
+7
-2
arch/arm/kernel/sys_arm.c
arch/arm/kernel/sys_arm.c
+3
-11
No files found.
arch/alpha/kernel/process.c
View file @
bb37b84a
...
...
@@ -235,23 +235,18 @@ int
alpha_clone
(
unsigned
long
clone_flags
,
unsigned
long
usp
,
int
*
parent_tid
,
int
*
child_tid
,
unsigned
long
tls_value
,
struct
pt_regs
*
regs
)
{
struct
task_struct
*
p
;
if
(
!
usp
)
usp
=
rdusp
();
p
=
do_fork
(
clone_flags
&
~
CLONE_IDLETASK
,
usp
,
regs
,
0
,
parent_tid
,
child_tid
);
return
IS_ERR
(
p
)
?
PTR_ERR
(
p
)
:
p
->
pid
;
return
do_fork
(
clone_flags
&
~
CLONE_IDLETASK
,
usp
,
regs
,
0
,
parent_tid
,
child_tid
);
}
int
alpha_vfork
(
struct
pt_regs
*
regs
)
{
struct
task_struct
*
p
;
p
=
do_fork
(
CLONE_VFORK
|
CLONE_VM
|
SIGCHLD
,
rdusp
(),
regs
,
0
,
NULL
,
NULL
);
return
IS_ERR
(
p
)
?
PTR_ERR
(
p
)
:
p
->
pid
;
return
do_fork
(
CLONE_VFORK
|
CLONE_VM
|
SIGCHLD
,
rdusp
(),
regs
,
0
,
NULL
,
NULL
);
}
/*
...
...
arch/alpha/kernel/ptrace.c
View file @
bb37b84a
...
...
@@ -366,8 +366,8 @@ do_sys_ptrace(long request, long pid, long addr, long data,
ret
=
-
EIO
;
if
((
unsigned
long
)
data
>
_NSIG
)
break
;
/*
Mark
single stepping. */
child
->
thread_info
->
bpt_nsaved
=
-
1
;
/*
Set
single stepping. */
ptrace_set_bpt
(
child
)
;
clear_tsk_thread_flag
(
child
,
TIF_SYSCALL_TRACE
);
wake_up_process
(
child
);
child
->
exit_code
=
data
;
...
...
@@ -397,11 +397,11 @@ syscall_trace(void)
return
;
if
(
!
(
current
->
ptrace
&
PT_PTRACED
))
return
;
current
->
exit_code
=
SIGTRAP
|
((
current
->
ptrace
&
PT_TRACESYSGOOD
)
?
0x80
:
0
);
current
->
state
=
TASK_STOPPED
;
notify_parent
(
current
,
SIGCHLD
);
schedule
();
/* The 0x80 provides a way for the tracing parent to distinguish
between a syscall stop and SIGTRAP delivery */
ptrace_notify
(
SIGTRAP
|
((
current
->
ptrace
&
PT_TRACESYSGOOD
)
?
0x80
:
0
)
);
/*
* This isn't the same as continuing with a signal, but it will do
* for normal use. strace only continues with a signal if the
...
...
arch/alpha/kernel/smp.c
View file @
bb37b84a
...
...
@@ -417,7 +417,12 @@ fork_by_hand(void)
/* Don't care about the contents of regs since we'll never
reschedule the forked task. */
struct
pt_regs
regs
;
return
do_fork
(
CLONE_VM
|
CLONE_IDLETASK
,
0
,
&
regs
,
0
,
NULL
,
NULL
);
int
pid
;
pid
=
do_fork
(
CLONE_VM
|
CLONE_IDLETASK
,
0
,
&
regs
,
0
,
NULL
,
NULL
);
if
(
pid
<
0
)
return
NULL
;
return
find_task_by_pid
(
pid
);
}
/*
...
...
@@ -436,7 +441,7 @@ smp_boot_one_cpu(int cpuid)
wish. We can't use kernel_thread since we must avoid
rescheduling the child. */
idle
=
fork_by_hand
();
if
(
IS_ERR
(
idle
)
)
if
(
!
idle
)
panic
(
"failed fork for CPU %d"
,
cpuid
);
init_idle
(
idle
,
cpuid
);
...
...
arch/arm/kernel/sys_arm.c
View file @
bb37b84a
...
...
@@ -238,9 +238,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr,
*/
asmlinkage
int
sys_fork
(
struct
pt_regs
*
regs
)
{
struct
task_struct
*
p
;
p
=
do_fork
(
SIGCHLD
,
regs
->
ARM_sp
,
regs
,
0
,
NULL
,
NULL
);
return
IS_ERR
(
p
)
?
PTR_ERR
(
p
)
:
p
->
pid
;
return
do_fork
(
SIGCHLD
,
regs
->
ARM_sp
,
regs
,
0
,
NULL
,
NULL
);
}
/* Clone a task - this clones the calling program thread.
...
...
@@ -248,8 +246,6 @@ asmlinkage int sys_fork(struct pt_regs *regs)
*/
asmlinkage
int
sys_clone
(
unsigned
long
clone_flags
,
unsigned
long
newsp
,
struct
pt_regs
*
regs
)
{
struct
task_struct
*
p
;
/*
* We don't support SETTID / CLEARTID
*/
...
...
@@ -259,16 +255,12 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, struct
if
(
!
newsp
)
newsp
=
regs
->
ARM_sp
;
p
=
do_fork
(
clone_flags
&
~
CLONE_IDLETASK
,
newsp
,
regs
,
0
,
NULL
,
NULL
);
return
IS_ERR
(
p
)
?
PTR_ERR
(
p
)
:
p
->
pid
;
return
do_fork
(
clone_flags
&
~
CLONE_IDLETASK
,
newsp
,
regs
,
0
,
NULL
,
NULL
);
}
asmlinkage
int
sys_vfork
(
struct
pt_regs
*
regs
)
{
struct
task_struct
*
p
;
p
=
do_fork
(
CLONE_VFORK
|
CLONE_VM
|
SIGCHLD
,
regs
->
ARM_sp
,
regs
,
0
,
NULL
,
NULL
);
return
IS_ERR
(
p
)
?
PTR_ERR
(
p
)
:
p
->
pid
;
return
do_fork
(
CLONE_VFORK
|
CLONE_VM
|
SIGCHLD
,
regs
->
ARM_sp
,
regs
,
0
,
NULL
,
NULL
);
}
/* sys_execve() executes a new program.
...
...
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