diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2008-11-20 21:32:17 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-21 02:54:28 -0500 |
commit | 3ddd972d970fdabbe6515aa2f95e0ef2c8df903d (patch) | |
tree | 22081885df366d462793580fd3b46aedddc66b5b /arch/x86/kernel/signal_64.c | |
parent | 64977609e316c86fad513d9bf0afff998581e59d (diff) |
x86: signal: rename COPY_SEG_STRICT to COPY_SEG_CPL3
Impact: cleanup
Rename macro COPY_SEG_STRICT to COPY_SEG_CPL3, as suggested by hpa.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/signal_64.c')
-rw-r--r-- | arch/x86/kernel/signal_64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index d2307e41fbdb..3d54d366ccb2 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c | |||
@@ -56,7 +56,7 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, | |||
56 | err |= __get_user(regs->x, &sc->x); \ | 56 | err |= __get_user(regs->x, &sc->x); \ |
57 | } | 57 | } |
58 | 58 | ||
59 | #define COPY_SEG_STRICT(seg) { \ | 59 | #define COPY_SEG_CPL3(seg) { \ |
60 | unsigned short tmp; \ | 60 | unsigned short tmp; \ |
61 | err |= __get_user(tmp, &sc->seg); \ | 61 | err |= __get_user(tmp, &sc->seg); \ |
62 | regs->seg = tmp | 3; \ | 62 | regs->seg = tmp | 3; \ |
@@ -98,13 +98,13 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, | |||
98 | #endif /* CONFIG_X86_64 */ | 98 | #endif /* CONFIG_X86_64 */ |
99 | 99 | ||
100 | #ifdef CONFIG_X86_32 | 100 | #ifdef CONFIG_X86_32 |
101 | COPY_SEG_STRICT(cs); | 101 | COPY_SEG_CPL3(cs); |
102 | COPY_SEG_STRICT(ss); | 102 | COPY_SEG_CPL3(ss); |
103 | #else /* !CONFIG_X86_32 */ | 103 | #else /* !CONFIG_X86_32 */ |
104 | /* Kernel saves and restores only the CS segment register on signals, | 104 | /* Kernel saves and restores only the CS segment register on signals, |
105 | * which is the bare minimum needed to allow mixed 32/64-bit code. | 105 | * which is the bare minimum needed to allow mixed 32/64-bit code. |
106 | * App's signal handler can save/restore other segments if needed. */ | 106 | * App's signal handler can save/restore other segments if needed. */ |
107 | COPY_SEG_STRICT(cs); | 107 | COPY_SEG_CPL3(cs); |
108 | #endif /* CONFIG_X86_32 */ | 108 | #endif /* CONFIG_X86_32 */ |
109 | 109 | ||
110 | err |= __get_user(tmpflags, &sc->flags); | 110 | err |= __get_user(tmpflags, &sc->flags); |