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
b24fd48a
Commit
b24fd48a
authored
Sep 13, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
0a305d2e
34f521fd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
arch/arm/kernel/calls.S
arch/arm/kernel/calls.S
+1
-1
arch/arm/kernel/entry-common.S
arch/arm/kernel/entry-common.S
+4
-0
No files found.
arch/arm/kernel/calls.S
View file @
b24fd48a
...
...
@@ -131,7 +131,7 @@ __syscall_start:
.
long
sys_wait4
/*
115
*/
.
long
sys_swapoff
.
long
sys_sysinfo
.
long
sys_ipc
.
long
sys_ipc
_wrapper
.
long
sys_fsync
.
long
sys_sigreturn_wrapper
/*
120
*/
.
long
sys_clone_wrapper
...
...
arch/arm/kernel/entry-common.S
View file @
b24fd48a
...
...
@@ -273,6 +273,10 @@ sys_mbind_wrapper:
str
r5
,
[
sp
,
#
4
]
b
sys_mbind
sys_ipc_wrapper
:
str
r5
,
[
sp
,
#
4
]
@
push
sixth
arg
b
sys_ipc
/*
*
Note
:
off_4k
(
r5
)
is
always
units
of
4
K
.
If
we
can
't do the requested
*
offset
,
we
return
EINVAL
.
...
...
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