x86/asm/entry: Change all 'user_mode_vm()' calls to 'user_mode()'

user_mode_vm() and user_mode() are now the same.  Change all callers
of user_mode_vm() to user_mode().

The next patch will remove the definition of user_mode_vm.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brad Spengler <spender@grsecurity.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/43b1f57f3df70df5a08b0925897c660725015554.1426728647.git.luto@kernel.org
[ Merged to a more recent kernel. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index cf3df1d8d039..ab3b65639a3e 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -278,7 +278,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
         print_modules();
         show_regs(regs);
 #ifdef CONFIG_X86_32
-        if (user_mode_vm(regs)) {
+        if (user_mode(regs)) {
                 sp = regs->sp;
                 ss = regs->ss & 0xffff;
         } else {
@@ -307,7 +307,7 @@ void die(const char *str, struct pt_regs *regs, long err)
         unsigned long flags = oops_begin();
         int sig = SIGSEGV;
 
-        if (!user_mode_vm(regs))
+        if (!user_mode(regs))
                 report_bug(regs->ip, regs);
 
         if (__die(str, regs, err))