From: Heiko Carstens <[EMAIL PROTECTED]> Temporarily rename this function to avoid merge conflicts and/or dependencies. This function will be removed as soon as git-s390 and kvm.git are finally upstream.
Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]> Signed-off-by: Carsten Otte <[EMAIL PROTECTED]> --- arch/s390/kvm/priv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: kvm/arch/s390/kvm/priv.c =================================================================== --- kvm.orig/arch/s390/kvm/priv.c +++ kvm/arch/s390/kvm/priv.c @@ -151,7 +151,7 @@ static int handle_chsc(struct kvm_vcpu * return 0; } -static unsigned int stfl(void) +static unsigned int kvm_stfl(void) { asm volatile( " .insn s,0xb2b10000,0(0)\n" /* stfl */ @@ -162,7 +162,7 @@ static unsigned int stfl(void) static int handle_stfl(struct kvm_vcpu *vcpu) { - unsigned int facility_list = stfl(); + unsigned int facility_list = kvm_stfl(); int rc; vcpu->stat.instruction_stfl++; ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel