From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Mon, 4 Mar 2013 23:10:32 +0000 (-0300)
Subject: Merge branch 'master' into queue
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ee2c25efdd46d7ed5605d6fe877bdf4b47a4ab2e;p=deliverable%2Flinux.git

Merge branch 'master' into queue

* master: (15791 commits)
  Linux 3.9-rc1
  btrfs/raid56: Add missing #include <linux/vmalloc.h>
  fix compat_sys_rt_sigprocmask()
  SUNRPC: One line comment fix
  ext4: enable quotas before orphan cleanup
  ext4: don't allow quota mount options when quota feature enabled
  ext4: fix a warning from sparse check for ext4_dir_llseek
  ext4: convert number of blocks to clusters properly
  ext4: fix possible memory leak in ext4_remount()
  jbd2: fix ERR_PTR dereference in jbd2__journal_start
  metag: Provide dma_get_sgtable()
  metag: prom.h: remove declaration of metag_dt_memblock_reserve()
  metag: copy devicetree to non-init memory
  metag: cleanup metag_ksyms.c includes
  metag: move mm/init.c exports out of metag_ksyms.c
  metag: move usercopy.c exports out of metag_ksyms.c
  metag: move setup.c exports out of metag_ksyms.c
  metag: move kick.c exports out of metag_ksyms.c
  metag: move traps.c exports out of metag_ksyms.c
  metag: move irq enable out of irqflags.h on SMP
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Conflicts:
	arch/x86/kernel/kvmclock.c
---

ee2c25efdd46d7ed5605d6fe877bdf4b47a4ab2e
diff --cc arch/x86/kernel/kvmclock.c
index b730efad6fe9,0732f0089a3d..d2c381280e3c
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@@ -160,14 -160,10 +160,14 @@@ int kvm_register_clock(char *txt
  {
  	int cpu = smp_processor_id();
  	int low, high, ret;
 -	struct pvclock_vcpu_time_info *src = &hv_clock[cpu].pvti;
 +	struct pvclock_vcpu_time_info *src;
 +
 +	if (!hv_clock)
 +		return 0;
  
 +	src = &hv_clock[cpu].pvti;
- 	low = (int)__pa(src) | 1;
- 	high = ((u64)__pa(src) >> 32);
+ 	low = (int)slow_virt_to_phys(src) | 1;
+ 	high = ((u64)slow_virt_to_phys(src) >> 32);
  	ret = native_write_msr_safe(msr_kvm_system_time, low, high);
  	printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n",
  	       cpu, high, low, txt);