Pull pv_ops-xen into release branch

diff --combined arch/ia64/Kconfig
index 892f296f99b6c3c1e9c8eb494201979f194fd1d3,9318dee225373b4dfa45d937dd10b37e2f29b4b5..239ad6b1c74f4b1627cbd8424d9b6f03c4ed007d
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -21,7 -21,6 +21,7 @@@ config IA6
        select HAVE_KRETPROBES
        select HAVE_DMA_ATTRS
        select HAVE_KVM
 +      select HAVE_ARCH_TRACEHOOK
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@@ -109,6 -108,33 +109,33 @@@ config AUDIT_ARC
        bool
        default y
  
+ menuconfig PARAVIRT_GUEST
+       bool "Paravirtualized guest support"
+       help
+         Say Y here to get to see options related to running Linux under
+         various hypervisors.  This option alone does not add any kernel code.
+ 
+         If you say N, all options in this submenu will be skipped and disabled.
+ 
+ if PARAVIRT_GUEST
+ 
+ config PARAVIRT
+       bool "Enable paravirtualization code"
+       depends on PARAVIRT_GUEST
+       default y
+       bool
+       default y
+       help
+         This changes the kernel so it can modify itself when it is run
+         under a hypervisor, potentially improving performance significantly
+         over full virtualization.  However, when run without a hypervisor
+         the kernel is theoretically slower and slightly larger.
+ 
+ 
+ source "arch/ia64/xen/Kconfig"
+ 
+ endif
+ 
  choice
        prompt "System type"
        default IA64_GENERIC
@@@ -130,6 -156,7 +157,7 @@@ config IA64_GENERI
          SGI-SN2               For SGI Altix systems
          SGI-UV                For SGI UV systems
          Ski-simulator         For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
+         Xen-domU              For xen domU system
  
          If you don't know what to do, choose "generic".
  
@@@ -180,6 -207,10 +208,10 @@@ config IA64_HP_SI
        bool "Ski-simulator"
        select SWIOTLB
  
+ config IA64_XEN_GUEST
+       bool "Xen guest"
+       depends on XEN
+ 
  endchoice
  
  choice

diff --combined arch/ia64/kernel/process.c
index 341a0319a5ba962f7ed3d979fca76ac8fc939a79,8de0f460c88d3207ef62a148a60777c57fe88279..c57162705147e500981235cbec79bd416c5ec136
--- 1/arch/ia64/kernel/process.c
--- 2/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@@ -28,7 -28,6 +28,7 @@@
  #include <linux/delay.h>
  #include <linux/kdebug.h>
  #include <linux/utsname.h>
 +#include <linux/tracehook.h>
  
  #include <asm/cpu.h>
  #include <asm/delay.h>
@@@ -161,6 -160,21 +161,6 @@@ show_regs (struct pt_regs *regs
                show_stack(NULL, NULL);
  }
  
 -void tsk_clear_notify_resume(struct task_struct *tsk)
 -{
 -#ifdef CONFIG_PERFMON
 -      if (tsk->thread.pfm_needs_checking)
 -              return;
 -#endif
 -      if (test_ti_thread_flag(task_thread_info(tsk), TIF_RESTORE_RSE))
 -              return;
 -      clear_ti_thread_flag(task_thread_info(tsk), TIF_NOTIFY_RESUME);
 -}
 -
 -/*
 - * do_notify_resume_user():
 - *    Called from notify_resume_user at entry.S, with interrupts disabled.
 - */
  void
  do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
  {
@@@ -189,11 -203,6 +189,11 @@@
                ia64_do_signal(scr, in_syscall);
        }
  
 +      if (test_thread_flag(TIF_NOTIFY_RESUME)) {
 +              clear_thread_flag(TIF_NOTIFY_RESUME);
 +              tracehook_notify_resume(&scr->pt);
 +      }
 +
        /* copy user rbs to kernel rbs */
        if (unlikely(test_thread_flag(TIF_RESTORE_RSE))) {
                local_irq_enable();     /* force interrupt enable */
@@@ -242,7 -251,6 +242,6 @@@ default_idle (void
  /* We don't actually take CPU down, just spin without interrupts. */
  static inline void play_dead(void)
  {
-       extern void ia64_cpu_local_tick (void);
        unsigned int this_cpu = smp_processor_id();
  
        /* Ack it */