[PATCH] xen: x86: Use more usermode macro

Use the user_mode macro where it's possible.

Signed-off-by: Vincent Hanquez <vincent.hanquez@cl.cam.ac.uk>
Cc: Ian Pratt <m+Ian.Pratt@cl.cam.ac.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 2468ab70c386e148cf3423fa38677337d7198ca1..be3efba7caf715473402d0c33e22aab77ca30b4b 100644 (file)
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -266,7 +266,7 @@ void show_regs(struct pt_regs * regs)
        printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());
        print_symbol("EIP is at %s\n", regs->eip);
 
-       if (regs->xcs & 3)
+       if (user_mode(regs))
                printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
        printk(" EFLAGS: %08lx    %s  (%s)\n",
               regs->eflags, print_tainted(), system_utsname.release);

diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index 839d4dc88cd42858b4a244fd88cd513f6aa99d22..b9b8f4e20fad6e79fbc5acef91115415cd3aaace 100644 (file)
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -605,7 +605,7 @@ int fastcall do_signal(struct pt_regs *regs, sigset_t *oldset)
         * kernel mode. Just return without doing anything
         * if so.
         */
-       if ((regs->xcs & 3) != 3)
+       if (!user_mode(regs))
                return 1;
 
        if (current->flags & PF_FREEZE) {

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index c01d7ba6d7e8ab025483b53446c52b313d3a2f5b..e4d4e2162c7a3873d36f5d0e64c451c96852889b 100644 (file)
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -210,7 +210,7 @@ void show_registers(struct pt_regs *regs)
 
        esp = (unsigned long) (&regs->esp);
        ss = __KERNEL_DS;
-       if (regs->xcs & 3) {
+       if (user_mode(regs)) {
                in_kernel = 0;
                esp = regs->esp;
                ss = regs->xss & 0xffff;
@@ -266,7 +266,7 @@ static void handle_BUG(struct pt_regs *regs)
        char c;
        unsigned long eip;
 
-       if (regs->xcs & 3)
+       if (user_mode(regs))
                goto no_bug;            /* Not in kernel */
 
        eip = regs->eip;
@@ -354,7 +354,7 @@ void die(const char * str, struct pt_regs * regs, long err)
 
 static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err)
 {
-       if (!(regs->eflags & VM_MASK) && !(3 & regs->xcs))
+       if (!user_mode_vm(regs))
                die(str, regs, err);
 }
 
@@ -367,7 +367,7 @@ static void do_trap(int trapnr, int signr, char *str, int vm86,
                goto trap_signal;
        }
 
-       if (!(regs->xcs & 3))
+       if (!user_mode(regs))
                goto kernel_trap;
 
        trap_signal: {
@@ -489,7 +489,7 @@ fastcall void do_general_protection(struct pt_regs * regs, long error_code)
        if (regs->eflags & VM_MASK)
                goto gp_in_vm86;
 
-       if (!(regs->xcs & 3))
+       if (!user_mode(regs))
                goto gp_in_kernel;
 
        current->thread.error_code = error_code;
@@ -716,7 +716,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code)
                 * check for kernel mode by just checking the CPL
                 * of CS.
                 */
-               if ((regs->xcs & 3) == 0)
+               if (!user_mode(regs))
                        goto clear_TF_reenable;
        }