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
32d19579
Commit
32d19579
authored
20 years ago
by
Richard Henderson
Browse files
Options
Browse Files
Download
Plain Diff
Merge kanga.twiddle.home:/home/rth/work/linux/linus-2.6
into kanga.twiddle.home:/home/rth/work/linux/axp-2.6
parents
1140b22f
76d41460
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
15 deletions
+23
-15
arch/alpha/kernel/entry.S
arch/alpha/kernel/entry.S
+18
-0
arch/alpha/kernel/process.c
arch/alpha/kernel/process.c
+3
-12
arch/alpha/kernel/signal.c
arch/alpha/kernel/signal.c
+2
-3
No files found.
arch/alpha/kernel/entry.S
View file @
32d19579
...
...
@@ -924,6 +924,24 @@ sys_ptrace:
jmp
$
31
,
do_sys_ptrace
.
end
sys_ptrace
.
align
4
.
globl
sys_execve
.
ent
sys_execve
sys_execve
:
.
prologue
0
mov
$sp
,
$
19
jmp
$
31
,
do_sys_execve
.
end
sys_execve
.
align
4
.
globl
osf_sigprocmask
.
ent
osf_sigprocmask
osf_sigprocmask
:
.
prologue
0
mov
$sp
,
$
18
jmp
$
31
,
do_osf_sigprocmask
.
end
osf_sigprocmask
.
align
4
.
globl
alpha_ni_syscall
.
ent
alpha_ni_syscall
...
...
This diff is collapsed.
Click to expand it.
arch/alpha/kernel/process.c
View file @
32d19579
...
...
@@ -456,19 +456,10 @@ dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task)
/*
* sys_execve() executes a new program.
*
* This works due to the alpha calling sequence: the first 6 args
* are gotten from registers, while the rest is on the stack, so
* we get a0-a5 for free, and then magically find "struct pt_regs"
* on the stack for us..
*
* Don't do this at home.
*/
asmlinkage
int
sys_execve
(
char
__user
*
ufilename
,
char
__user
*
__user
*
argv
,
char
__user
*
__user
*
envp
,
unsigned
long
a3
,
unsigned
long
a4
,
unsigned
long
a5
,
struct
pt_regs
regs
)
do_sys_execve
(
char
__user
*
ufilename
,
char
__user
*
__user
*
argv
,
char
__user
*
__user
*
envp
,
struct
pt_regs
*
regs
)
{
int
error
;
char
*
filename
;
...
...
@@ -477,7 +468,7 @@ sys_execve(char __user *ufilename, char __user * __user *argv,
error
=
PTR_ERR
(
filename
);
if
(
IS_ERR
(
filename
))
goto
out
;
error
=
do_execve
(
filename
,
argv
,
envp
,
&
regs
);
error
=
do_execve
(
filename
,
argv
,
envp
,
regs
);
putname
(
filename
);
out:
return
error
;
...
...
This diff is collapsed.
Click to expand it.
arch/alpha/kernel/signal.c
View file @
32d19579
...
...
@@ -53,8 +53,7 @@ static int do_signal(sigset_t *, struct pt_regs *, struct switch_stack *,
* operation, as all of this is local to this thread.
*/
asmlinkage
unsigned
long
osf_sigprocmask
(
int
how
,
unsigned
long
newmask
,
long
a2
,
long
a3
,
long
a4
,
long
a5
,
struct
pt_regs
regs
)
do_osf_sigprocmask
(
int
how
,
unsigned
long
newmask
,
struct
pt_regs
*
regs
)
{
unsigned
long
oldmask
=
-
EINVAL
;
...
...
@@ -78,7 +77,7 @@ osf_sigprocmask(int how, unsigned long newmask, long a2, long a3,
recalc_sigpending
();
spin_unlock_irq
(
&
current
->
sighand
->
siglock
);
(
&
regs
)
->
r0
=
0
;
/* special no error return */
regs
->
r0
=
0
;
/* special no error return */
}
return
oldmask
;
}
...
...
This diff is collapsed.
Click to expand it.
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