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

Commit fa1e1bdf authored by Vincent Hanquez's avatar Vincent Hanquez Committed by Linus Torvalds
Browse files

[PATCH] xen: x86: Rename usermode macro 



Rename user_mode to user_mode_vm and add a user_mode macro similar to the
x86-64 one.

This is useful for Xen because the linux xen kernel does not runs on the same
priviledge that a vanilla linux kernel, and with this we just need to redefine
user_mode().

Signed-off-by: default avatarVincent Hanquez <vincent.hanquez@cl.cam.ac.uk>
Cc: Ian Pratt <m+Ian.Pratt@cl.cam.ac.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1cc6f12e

arch/i386/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ inline void smp_local_timer_interrupt(struct pt_regs * regs) 
		}



#ifdef CONFIG_SMP

		update_process_times(user_mode(regs));

		update_process_times(user_mode_vm(regs));

#endif

	}

arch/i386/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code) 
	info.si_code = TRAP_BRKPT;



	/* User-mode eip? */

	info.si_addr = user_mode(regs) ? (void __user *) regs->eip : NULL;

	info.si_addr = user_mode_vm(regs) ? (void __user *) regs->eip : NULL;



	/* Send us the fakey SIGTRAP */

	force_sig_info(SIGTRAP, &info, tsk);

arch/i386/mach-voyager/voyager_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ smp_local_timer_interrupt(struct pt_regs * regs) 
						per_cpu(prof_counter, cpu);

		}



		update_process_times(user_mode(regs));

		update_process_times(user_mode_vm(regs));

	}



	if( ((1<<cpu) & voyager_extended_vic_processors) == 0)

arch/i386/oprofile/backtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) 
	head = (struct frame_head *)regs->ebp;

#endif



	if (!user_mode(regs)) {

	if (!user_mode_vm(regs)) {

		while (depth-- && valid_kernel_stack(head, regs))

			head = dump_backtrace(head);

		return;

include/asm-i386/ptrace.h

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ struct pt_regs { 
#ifdef __KERNEL__

struct task_struct;

extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code);

#define user_mode(regs) ((VM_MASK & (regs)->eflags) || (3 & (regs)->xcs))

#define user_mode(regs)		(3 & (regs)->xcs)

#define user_mode_vm(regs)	((VM_MASK & (regs)->eflags) || user_mode(regs))

#define instruction_pointer(regs) ((regs)->eip)

#if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER)

extern unsigned long profile_pc(struct pt_regs *regs);