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
cec3fd3e
Commit
cec3fd3e
authored
Jul 30, 2008
by
Paul Mundt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sh: Tidy up the _TIF work masks, and fix syscall trace bug on singlestep.
Signed-off-by:
Paul Mundt
<
lethal@linux-sh.org
>
parent
daf423db
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
15 deletions
+31
-15
arch/sh/include/asm/thread_info.h
arch/sh/include/asm/thread_info.h
+28
-12
arch/sh/kernel/cpu/sh5/entry.S
arch/sh/kernel/cpu/sh5/entry.S
+1
-1
arch/sh/kernel/entry-common.S
arch/sh/kernel/entry-common.S
+2
-2
No files found.
arch/sh/include/asm/thread_info.h
View file @
cec3fd3e
...
...
@@ -123,18 +123,34 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_MEMDIE 18
#define TIF_FREEZE 19
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
#define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)
#define _TIF_SINGLESTEP (1<<TIF_SINGLESTEP)
#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
#define _TIF_USEDFPU (1<<TIF_USEDFPU)
#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
#define _TIF_FREEZE (1<<TIF_FREEZE)
#define _TIF_WORK_MASK 0x000000FE
/* work to do on interrupt/exception return */
#define _TIF_ALLWORK_MASK 0x000000FF
/* work to do on any return to u-space */
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
#define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP)
#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
#define _TIF_USEDFPU (1 << TIF_USEDFPU)
#define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
#define _TIF_FREEZE (1 << TIF_FREEZE)
/*
* _TIF_ALLWORK_MASK and _TIF_WORK_MASK need to fit within a byte, or we
* blow the tst immediate size constraints and need to fix up
* arch/sh/kernel/entry-common.S.
*/
/* work to do in syscall trace */
#define _TIF_WORK_SYSCALL_MASK (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | \
_TIF_SYSCALL_AUDIT)
/* work to do on any return to u-space */
#define _TIF_ALLWORK_MASK (_TIF_SYSCALL_TRACE | _TIF_SIGPENDING | \
_TIF_NEED_RESCHED | _TIF_SYSCALL_AUDIT | \
_TIF_SINGLESTEP | _TIF_RESTORE_SIGMASK)
/* work to do on interrupt/exception return */
#define _TIF_WORK_MASK (_TIF_ALLWORK_MASK & ~(_TIF_SYSCALL_TRACE | \
_TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP))
#endif
/* __KERNEL__ */
...
...
arch/sh/kernel/cpu/sh5/entry.S
View file @
cec3fd3e
...
...
@@ -1300,7 +1300,7 @@ syscall_allowed:
getcon
KCR0
,
r2
ld.l
r2
,
TI_FLAGS
,
r4
movi
(
_TIF_SYSCALL_TRACE
| _TIF_SINGLESTEP |
_TIF_SYSCALL_AUDIT
)
,
r6
movi
_TIF_WORK_SYSCALL_MASK
,
r6
and
r6
,
r4
,
r6
beq
/
l
r6
,
ZERO
,
tr0
...
...
arch/sh/kernel/entry-common.S
View file @
cec3fd3e
...
...
@@ -202,7 +202,7 @@ work_resched:
syscall_exit_work
:
!
r0
:
current_thread_info
->
flags
!
r8
:
current_thread_info
tst
#
_TIF_
SYSCALL_TRACE
| _TIF_SINGLESTEP |
_TIF_SYSCALL_AUDIT
,
r0
tst
#
_TIF_
WORK_SYSCALL_MASK
,
r0
bt
/
s
work_pending
tst
#
_TIF_NEED_RESCHED
,
r0
#ifdef CONFIG_TRACE_IRQFLAGS
...
...
@@ -351,7 +351,7 @@ ENTRY(system_call)
!
get_current_thread_info
r8
,
r10
mov.l
@
(
TI_FLAGS
,
r8
),
r8
mov
#
(
_TIF_SYSCALL_TRACE
|
_TIF_SYSCALL_AUDIT
)
,
r10
mov
#
_TIF_WORK_SYSCALL_MASK
,
r10
tst
r10
,
r8
bf
syscall_trace_entry
!
...
...
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