Skip to contentSkip to conversation

x86: signal: rename COPY_SEG_STRICT to COPY_SEG_CPL3

PATCH Applied Hiroshi Shimamoto 2 participants 2 messages Nov 21, 2008 x86

lore
Share & tools
lore

Hiroshi Shimamoto

author
#0 lore raw

PATCH 1/1 x86: signal: rename COPY_SEG_STRICT to COPY_SEG_CPL3

From: Hiroshi Shimamoto <[email protected]>

Impact: cleanup

Rename macro COPY_SEG_STRICT to COPY_SEG_CPL3.

Signed-off-by Hiroshi Shimamoto <[email protected]>
---
 arch/x86/kernel/signal_32.c |    8 ++++----
 arch/x86/kernel/signal_64.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/kernel/signal_32.c +4 -4
index 514171a..c2aabeb 100644
@@ -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);
arch/x86/kernel/signal_64.c +4 -4
index d2307e4..3d54d36 100644
@@ -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);
Signature · 1 line
1.5.6
Applied
#1 lore raw
Quoted 11 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

Impact: cleanup

Rename macro COPY_SEG_STRICT to COPY_SEG_CPL3.

Signed-off-by Hiroshi Shimamoto <[email protected]>
---
 arch/x86/kernel/signal_32.c |    8 ++++----
 arch/x86/kernel/signal_64.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

applied to tip/x86/signal, thanks.

I thought i already did it based on hpa's suggestion in the previous discussion but apparently i forgot about it :-/

Ingo