linux-kernel - linux-next: manual merge of the kvm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 1 Mar 2013 13:51:07 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jan Kiszka <jan.kiszka@...mens.com>,
	Dave Hansen <dave@...ux.vnet.ibm.com>,
	"H. Peter Anvin" <hpa@...or.com>
Subject: linux-next: manual merge of the kvm tree with Linus' tree

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
arch/x86/kernel/kvmclock.c between commit 5dfd486c4750 ("x86, kvm: Fix
kvm's use of __pa() on percpu areas") from Linus' tree and commit
fe1140cc3694 ("x86: kvmclock: Do not setup kvmclock vsyscall in the
absence of that clock") from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/kernel/kvmclock.c
index 0732f00,b730efa..0000000
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@@ -160,10 -160,14 +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);

Content of type "application/pgp-signature" skipped