Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f39b6f0e authored Mar 18, 2015 by Andy Lutomirski Committed by Ingo Molnar Mar 23, 2015

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>

parent efa70451

arch/x86/kernel/alternative.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -715,7 +715,7 @@ int poke_int3_handler(struct pt_regs *regs)
	if (likely(!bp_patching_in_progress))		if (likely(!bp_patching_in_progress))
	return 0;		return 0;

	if (user_mode_vm(regs) \|\| regs->ip != (unsigned long)bp_int3_addr)		if (user_mode(regs) \|\| regs->ip != (unsigned long)bp_int3_addr)
	return 0;		return 0;

	/* set up the specified breakpoint handler */		/* set up the specified breakpoint handler */

arch/x86/kernel/crash.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
	#ifdef CONFIG_X86_32		#ifdef CONFIG_X86_32
	struct pt_regs fixed_regs;		struct pt_regs fixed_regs;

	if (!user_mode_vm(regs)) {		if (!user_mode(regs)) {
	crash_fixup_ss_esp(&fixed_regs, regs);		crash_fixup_ss_esp(&fixed_regs, regs);
	regs = &fixed_regs;		regs = &fixed_regs;
	}		}

arch/x86/kernel/dumpstack.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -278,7 +278,7 @@ int __die(const char str, struct pt_regs regs, long err)
	print_modules();		print_modules();
	show_regs(regs);		show_regs(regs);
	#ifdef CONFIG_X86_32		#ifdef CONFIG_X86_32
	if (user_mode_vm(regs)) {		if (user_mode(regs)) {
	sp = regs->sp;		sp = regs->sp;
	ss = regs->ss & 0xffff;		ss = regs->ss & 0xffff;
	} else {		} else {
	@@ -307,7 +307,7 @@ void die(const char str, struct pt_regs regs, long err)
	unsigned long flags = oops_begin();		unsigned long flags = oops_begin();
	int sig = SIGSEGV;		int sig = SIGSEGV;

	if (!user_mode_vm(regs))		if (!user_mode(regs))
	report_bug(regs->ip, regs);		report_bug(regs->ip, regs);

	if (__die(str, regs, err))		if (__die(str, regs, err))

arch/x86/kernel/dumpstack_32.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,13 +123,13 @@ void show_regs(struct pt_regs *regs)
	int i;		int i;

	show_regs_print_info(KERN_EMERG);		show_regs_print_info(KERN_EMERG);
	__show_regs(regs, !user_mode_vm(regs));		__show_regs(regs, !user_mode(regs));

	/*		/*
	* When in-kernel, we also print out the stack and code at the		* When in-kernel, we also print out the stack and code at the
	* time of the fault..		* time of the fault..
	*/		*/
	if (!user_mode_vm(regs)) {		if (!user_mode(regs)) {
	unsigned int code_prologue = code_bytes * 43 / 64;		unsigned int code_prologue = code_bytes * 43 / 64;
	unsigned int code_len = code_bytes;		unsigned int code_len = code_bytes;
	unsigned char c;		unsigned char c;

arch/x86/kernel/i387.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
	static inline bool interrupted_user_mode(void)		static inline bool interrupted_user_mode(void)
	{		{
	struct pt_regs *regs = get_irq_regs();		struct pt_regs *regs = get_irq_regs();
	return regs && user_mode_vm(regs);		return regs && user_mode(regs);
	}		}

	/*		/*