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
1227dd77
Commit
1227dd77
authored
Apr 24, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TIF_NOTIFY_RESUME is defined on all targets now
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
f9369910
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
12 deletions
+0
-12
include/linux/tracehook.h
include/linux/tracehook.h
+0
-2
security/keys/keyctl.c
security/keys/keyctl.c
+0
-10
No files found.
include/linux/tracehook.h
View file @
1227dd77
...
@@ -153,7 +153,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
...
@@ -153,7 +153,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
ptrace_notify
(
SIGTRAP
);
ptrace_notify
(
SIGTRAP
);
}
}
#ifdef TIF_NOTIFY_RESUME
/**
/**
* set_notify_resume - cause tracehook_notify_resume() to be called
* set_notify_resume - cause tracehook_notify_resume() to be called
* @task: task that will call tracehook_notify_resume()
* @task: task that will call tracehook_notify_resume()
...
@@ -185,6 +184,5 @@ static inline void set_notify_resume(struct task_struct *task)
...
@@ -185,6 +184,5 @@ static inline void set_notify_resume(struct task_struct *task)
static
inline
void
tracehook_notify_resume
(
struct
pt_regs
*
regs
)
static
inline
void
tracehook_notify_resume
(
struct
pt_regs
*
regs
)
{
{
}
}
#endif
/* TIF_NOTIFY_RESUME */
#endif
/* <linux/tracehook.h> */
#endif
/* <linux/tracehook.h> */
security/keys/keyctl.c
View file @
1227dd77
...
@@ -1454,7 +1454,6 @@ long keyctl_get_security(key_serial_t keyid,
...
@@ -1454,7 +1454,6 @@ long keyctl_get_security(key_serial_t keyid,
*/
*/
long
keyctl_session_to_parent
(
void
)
long
keyctl_session_to_parent
(
void
)
{
{
#ifdef TIF_NOTIFY_RESUME
struct
task_struct
*
me
,
*
parent
;
struct
task_struct
*
me
,
*
parent
;
const
struct
cred
*
mycred
,
*
pcred
;
const
struct
cred
*
mycred
,
*
pcred
;
struct
cred
*
cred
,
*
oldcred
;
struct
cred
*
cred
,
*
oldcred
;
...
@@ -1542,15 +1541,6 @@ long keyctl_session_to_parent(void)
...
@@ -1542,15 +1541,6 @@ long keyctl_session_to_parent(void)
error_keyring:
error_keyring:
key_ref_put
(
keyring_r
);
key_ref_put
(
keyring_r
);
return
ret
;
return
ret
;
#else
/* !TIF_NOTIFY_RESUME */
/*
* To be removed when TIF_NOTIFY_RESUME has been implemented on
* m68k/xtensa
*/
#warning TIF_NOTIFY_RESUME not implemented
return
-
EOPNOTSUPP
;
#endif
/* !TIF_NOTIFY_RESUME */
}
}
/*
/*
...
...
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