# HG changeset patch
# User Tristan Gingold <tgingold@xxxxxxx>
# Date 1178630697 -7200
# Node ID 8e5083feaa526653ae9b95b1d4117eb8066bbf35
# Parent  8519e5db6510a066788bb525a17588bad3674203
Defined guest_mode and use it instead of user_mode.

Signed-off-by: Tristan Gingold <tgingold@xxxxxxx>

diff -r 8519e5db6510 -r 8e5083feaa52 xen/arch/ia64/vmx/vmx_process.c
--- a/xen/arch/ia64/vmx/vmx_process.c	Tue May 08 15:07:51 2007 +0200
+++ b/xen/arch/ia64/vmx/vmx_process.c	Tue May 08 15:24:57 2007 +0200
@@ -164,7 +164,7 @@ vmx_ia64_handle_break (unsigned long ifa
         if (iim == 0) 
             vmx_die_if_kernel("Break 0 in Hypervisor.", regs, iim);
 
-        if (!user_mode(regs)) {
+        if (ia64_psr(regs)->cpl == 0) {
             /* Allow hypercalls only when cpl = 0.  */
             if (iim == d->arch.breakimm) {
                 ia64_hypercall(regs);
diff -r 8519e5db6510 -r 8e5083feaa52 xen/arch/ia64/xen/faults.c
--- a/xen/arch/ia64/xen/faults.c	Tue May 08 15:07:51 2007 +0200
+++ b/xen/arch/ia64/xen/faults.c	Tue May 08 15:24:57 2007 +0200
@@ -209,7 +209,7 @@ void ia64_do_page_fault(unsigned long ad
 
 	if (is_ptc_l_needed)
 		vcpu_ptc_l(current, address, logps);
-	if (!user_mode(regs)) {
+	if (!guest_mode(regs)) {
 		/* The fault occurs inside Xen.  */
 		if (!ia64_done_with_exception(regs)) {
 			// should never happen.  If it does, region 0 addr may
diff -r 8519e5db6510 -r 8e5083feaa52 xen/arch/ia64/xen/xenmisc.c
--- a/xen/arch/ia64/xen/xenmisc.c	Tue May 08 15:07:51 2007 +0200
+++ b/xen/arch/ia64/xen/xenmisc.c	Tue May 08 15:24:57 2007 +0200
@@ -79,7 +79,7 @@ void console_print(char *msg)
 
 void die_if_kernel(char *str, struct pt_regs *regs, long err)
 {
-	if (user_mode(regs))
+	if (guest_mode(regs))
 		return;
 
 	printk("%s: %s %ld\n", __func__, str, err);
diff -r 8519e5db6510 -r 8e5083feaa52 xen/include/asm-ia64/linux-xen/asm/ptrace.h
--- a/xen/include/asm-ia64/linux-xen/asm/ptrace.h	Tue May 08 15:07:51 2007 +0200
+++ b/xen/include/asm-ia64/linux-xen/asm/ptrace.h	Tue May 08 15:24:57 2007 +0200
@@ -265,7 +265,11 @@ struct switch_stack {
   /* given a pointer to a task_struct, return the user's pt_regs */
 # define ia64_task_regs(t)		(((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1)
 # define ia64_psr(regs)			((struct ia64_psr *) &(regs)->cr_ipsr)
+#ifdef XEN
+# define guest_mode(regs)		(ia64_psr(regs)->cpl != 0)
+#else
 # define user_mode(regs)		(((struct ia64_psr *) &(regs)->cr_ipsr)->cpl != 0)
+#endif
 # define user_stack(task,regs)	((long) regs - (long) task == IA64_STK_OFFSET - sizeof(*regs))
 # define fsys_mode(task,regs)					\
   ({								\