From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Tue, 10 Jun 2008 06:00:31 +0000 (+0900)
Subject: [IA64] fix ia64_leave_kernel.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14205
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b32c86e8e0c71bb7e000848c1a3740615eb58400;p=xen.git

[IA64] fix ia64_leave_kernel.

This patch is for safe leaving hypervisor.
After calling do_softirq in ia64_leave_kernel, interrupts must be masked.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
---

diff --git a/xen/arch/ia64/linux-xen/entry.S b/xen/arch/ia64/linux-xen/entry.S
index 01ab0f85be..e25a5352ff 100644
--- a/xen/arch/ia64/linux-xen/entry.S
+++ b/xen/arch/ia64/linux-xen/entry.S
@@ -933,7 +933,7 @@ GLOBAL_ENTRY(ia64_leave_kernel)
 	;;
 (pUStk)	ssm psr.i
 (pUStk)	br.call.sptk.many b0=do_softirq
-(pUStk)	ssm psr.i
+(pUStk)	rsm psr.i
 	;;
 (pUStk)	br.call.sptk.many b0=reflect_event
 	;;