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
fa18484d
Commit
fa18484d
authored
May 02, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
arm: remove unused restart trampoline
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
6b5c8045
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
17 deletions
+0
-17
arch/arm/kernel/signal.c
arch/arm/kernel/signal.c
+0
-13
arch/arm/kernel/signal.h
arch/arm/kernel/signal.h
+0
-2
arch/arm/kernel/traps.c
arch/arm/kernel/traps.c
+0
-2
No files found.
arch/arm/kernel/signal.c
View file @
fa18484d
...
@@ -29,7 +29,6 @@
...
@@ -29,7 +29,6 @@
*/
*/
#define SWI_SYS_SIGRETURN (0xef000000|(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))
#define SWI_SYS_SIGRETURN (0xef000000|(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))
#define SWI_SYS_RT_SIGRETURN (0xef000000|(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))
#define SWI_SYS_RT_SIGRETURN (0xef000000|(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))
#define SWI_SYS_RESTART (0xef000000|__NR_restart_syscall|__NR_OABI_SYSCALL_BASE)
/*
/*
* With EABI, the syscall number has to be loaded into r7.
* With EABI, the syscall number has to be loaded into r7.
...
@@ -49,18 +48,6 @@ const unsigned long sigreturn_codes[7] = {
...
@@ -49,18 +48,6 @@ const unsigned long sigreturn_codes[7] = {
MOV_R7_NR_RT_SIGRETURN
,
SWI_SYS_RT_SIGRETURN
,
SWI_THUMB_RT_SIGRETURN
,
MOV_R7_NR_RT_SIGRETURN
,
SWI_SYS_RT_SIGRETURN
,
SWI_THUMB_RT_SIGRETURN
,
};
};
/*
* Either we support OABI only, or we have EABI with the OABI
* compat layer enabled. In the later case we don't know if
* user space is EABI or not, and if not we must not clobber r7.
* Always using the OABI syscall solves that issue and works for
* all those cases.
*/
const
unsigned
long
syscall_restart_code
[
2
]
=
{
SWI_SYS_RESTART
,
/* swi __NR_restart_syscall */
0xe49df004
,
/* ldr pc, [sp], #4 */
};
/*
/*
* atomically swap in the new signal mask, and wait for a signal.
* atomically swap in the new signal mask, and wait for a signal.
*/
*/
...
...
arch/arm/kernel/signal.h
View file @
fa18484d
...
@@ -8,7 +8,5 @@
...
@@ -8,7 +8,5 @@
* published by the Free Software Foundation.
* published by the Free Software Foundation.
*/
*/
#define KERN_SIGRETURN_CODE (CONFIG_VECTORS_BASE + 0x00000500)
#define KERN_SIGRETURN_CODE (CONFIG_VECTORS_BASE + 0x00000500)
#define KERN_RESTART_CODE (KERN_SIGRETURN_CODE + sizeof(sigreturn_codes))
extern
const
unsigned
long
sigreturn_codes
[
7
];
extern
const
unsigned
long
sigreturn_codes
[
7
];
extern
const
unsigned
long
syscall_restart_code
[
2
];
arch/arm/kernel/traps.c
View file @
fa18484d
...
@@ -819,8 +819,6 @@ void __init early_trap_init(void *vectors_base)
...
@@ -819,8 +819,6 @@ void __init early_trap_init(void *vectors_base)
*/
*/
memcpy
((
void
*
)(
vectors
+
KERN_SIGRETURN_CODE
-
CONFIG_VECTORS_BASE
),
memcpy
((
void
*
)(
vectors
+
KERN_SIGRETURN_CODE
-
CONFIG_VECTORS_BASE
),
sigreturn_codes
,
sizeof
(
sigreturn_codes
));
sigreturn_codes
,
sizeof
(
sigreturn_codes
));
memcpy
((
void
*
)(
vectors
+
KERN_RESTART_CODE
-
CONFIG_VECTORS_BASE
),
syscall_restart_code
,
sizeof
(
syscall_restart_code
));
flush_icache_range
(
vectors
,
vectors
+
PAGE_SIZE
);
flush_icache_range
(
vectors
,
vectors
+
PAGE_SIZE
);
modify_domain
(
DOMAIN_USER
,
DOMAIN_CLIENT
);
modify_domain
(
DOMAIN_USER
,
DOMAIN_CLIENT
);
...
...
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