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>

diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 514171a..c2aabeb 100644 (file)
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -145,7 +145,7 @@ asmlinkage int sys_sigaltstack(unsigned long bx)
                regs->seg = tmp;                        \
 }
 
-#define COPY_SEG_STRICT(seg)   {                       \
+#define COPY_SEG_CPL3(seg)     {                       \
                unsigned short tmp;                     \
                err |= __get_user(tmp, &sc->seg);       \
                regs->seg = tmp | 3;                    \
@@ -193,13 +193,13 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
 #endif /* CONFIG_X86_64 */
 
 #ifdef CONFIG_X86_32
-       COPY_SEG_STRICT(cs);
-       COPY_SEG_STRICT(ss);
+       COPY_SEG_CPL3(cs);
+       COPY_SEG_CPL3(ss);
 #else /* !CONFIG_X86_32 */
        /* Kernel saves and restores only the CS segment register on signals,
         * which is the bare minimum needed to allow mixed 32/64-bit code.
         * App's signal handler can save/restore other segments if needed. */
-       COPY_SEG_STRICT(cs);
+       COPY_SEG_CPL3(cs);
 #endif /* CONFIG_X86_32 */
 
        err |= __get_user(tmpflags, &sc->flags);

diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index d2307e4..3d54d36 100644 (file)
--- 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,
        err |= __get_user(regs->x, &sc->x);     \
 }
 
-#define COPY_SEG_STRICT(seg)   {                       \
+#define COPY_SEG_CPL3(seg)     {                       \
                unsigned short tmp;                     \
                err |= __get_user(tmp, &sc->seg);       \
                regs->seg = tmp | 3;                    \
@@ -98,13 +98,13 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
 #endif /* CONFIG_X86_64 */
 
 #ifdef CONFIG_X86_32
-       COPY_SEG_STRICT(cs);
-       COPY_SEG_STRICT(ss);
+       COPY_SEG_CPL3(cs);
+       COPY_SEG_CPL3(ss);
 #else /* !CONFIG_X86_32 */
        /* Kernel saves and restores only the CS segment register on signals,
         * which is the bare minimum needed to allow mixed 32/64-bit code.
         * App's signal handler can save/restore other segments if needed. */
-       COPY_SEG_STRICT(cs);
+       COPY_SEG_CPL3(cs);
 #endif /* CONFIG_X86_32 */
 
        err |= __get_user(tmpflags, &sc->flags);