Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (29 commits)
  [IA64] BUG to BUG_ON changes
  [IA64] Fix typo/thinko in arch/ia64/sn/kernel/sn2/sn2_smp.c
  ia64: remove some warnings.
  ia64/xen: fix the link error.
  ia64/pv_ops/bp/xen: implemented binary patchable pv_cpu_ops.
  ia64/pv_ops/binary patch: define paravirt_dv_serialize_data() and suppress false positive warning.
  ia64/pv_ops/bp/module: support binary patching for kernel module.
  ia64/pv_ops: implement binary patching optimization for native.
  ia64/pv_op/binarypatch: add helper functions to support binary patching for paravirt_ops.
  ia64/pv_ops/xen/gate.S: xen gate page paravirtualization
  ia64/pv_ops: paravirtualize gate.S.
  ia64/pv_ops: move down __kernel_syscall_via_epc.
  ia64/pv_ops/xen: define xen specific gate page.
  ia64/pv_ops: gate page paravirtualization.
  ia64/pv_ops/xen/pv_time_ops: implement sched_clock.
  ia64/pv_ops/pv_time_ops: add sched_clock hook.
  ia64/pv_ops/xen: paravirtualize read/write ar.itc and ar.itm
  ia64/pv_ops: paravirtualize mov = ar.itc.
  ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization
  ia64/pv_ops: paravirtualize fsys.S.
  ...

diff --combined arch/ia64/kernel/time.c
index d6747bae52d83e17cfb499747089c9936e4bfe32,c323c7b9c775e7aad55e46180b1f98fcf11cefdb..641c8b61c4f167200adf0e52646d5d823a509096
--- 1/arch/ia64/kernel/time.c
--- 2/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@@ -20,7 -20,6 +20,7 @@@
  #include <linux/efi.h>
  #include <linux/timex.h>
  #include <linux/clocksource.h>
 +#include <linux/platform_device.h>
  
  #include <asm/machvec.h>
  #include <asm/delay.h>
@@@ -50,6 -49,15 +50,15 @@@ EXPORT_SYMBOL(last_cli_ip)
  
  #endif
  
+ #ifdef CONFIG_PARAVIRT
+ /* We need to define a real function for sched_clock, to override the
+    weak default version */
+ unsigned long long sched_clock(void)
+ {
+         return paravirt_sched_clock();
+ }
+ #endif
+ 
  #ifdef CONFIG_PARAVIRT
  static void
  paravirt_clocksource_resume(void)
@@@ -406,21 -414,6 +415,21 @@@ static struct irqaction timer_irqactio
        .name =         "timer"
  };
  
 +static struct platform_device rtc_efi_dev = {
 +      .name = "rtc-efi",
 +      .id = -1,
 +};
 +
 +static int __init rtc_init(void)
 +{
 +      if (platform_device_register(&rtc_efi_dev) < 0)
 +              printk(KERN_ERR "unable to register rtc device...\n");
 +
 +      /* not necessarily an error */
 +      return 0;
 +}
 +module_init(rtc_init);
 +
  void __init
  time_init (void)
  {