# HG changeset patch # User Isaku Yamahata # Date 1213077631 -32400 # Node ID b844f87db11debd27bf464bf6aff7cc42456d486 # Parent 8f2979e64af5ff3a333db678fa4fe4393b21273e [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 diff -r 8f2979e64af5 -r b844f87db11d xen/arch/ia64/linux-xen/entry.S --- a/xen/arch/ia64/linux-xen/entry.S Tue Jun 10 14:58:27 2008 +0900 +++ b/xen/arch/ia64/linux-xen/entry.S Tue Jun 10 15:00:31 2008 +0900 @@ -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 ;;