From patchwork Wed Apr 25 11:50:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 154895 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 68C5CB6EEB for ; Wed, 25 Apr 2012 21:50:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758157Ab2DYLub (ORCPT ); Wed, 25 Apr 2012 07:50:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50598 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758114Ab2DYLua convert rfc822-to-8bit (ORCPT ); Wed, 25 Apr 2012 07:50:30 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id EF9BE906EB; Wed, 25 Apr 2012 13:50:29 +0200 (CEST) Subject: Re: [PATCH 1/2] KVM: PPC: bookehv: Use a Macro for saving/restoring guest registers to/from their 64 bit copies. Mime-Version: 1.0 (Apple Message framework v1257) From: Alexander Graf In-Reply-To: <1335353203-18766-1-git-send-email-Varun.Sethi@freescale.com> Date: Wed, 25 Apr 2012 13:50:28 +0200 Cc: , Message-Id: <1535656C-A0B6-4500-A74B-0564FFF8616A@suse.de> References: <1335353203-18766-1-git-send-email-Varun.Sethi@freescale.com> To: Varun Sethi X-Mailer: Apple Mail (2.1257) Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org On 25.04.2012, at 13:26, Varun Sethi wrote: > Introduced PPC_STD/PPC_LD macros for saving/restoring guest registers to/from their 64 bit copies. Thanks, applied both to kvm-ppc-next, with the following patch on top: commit 03ae8a683c7af11c17e44e963b7eac0339d97c66 Author: Alexander Graf Date: Wed Apr 25 13:48:54 2012 +0200 KVM: PPC: Restrict PPC_[L|ST]D macro to asm code We only want asm code macros to be accessible from asm code, so #ifdef it depending on it. Signed-off-by: Alexander Graf Alex --- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h index 7d4018d..76fdcfe 100644 --- a/arch/powerpc/include/asm/kvm_asm.h +++ b/arch/powerpc/include/asm/kvm_asm.h @@ -20,6 +20,7 @@ #ifndef __POWERPC_KVM_ASM_H__ #define __POWERPC_KVM_ASM_H__ +#ifdef __ASSEMBLY__ #ifdef CONFIG_64BIT #define PPC_STD(sreg, offset, areg) std sreg, (offset)(areg) #define PPC_LD(treg, offset, areg) ld treg, (offset)(areg) @@ -27,6 +28,7 @@ #define PPC_STD(sreg, offset, areg) stw sreg, (offset+4)(areg) #define PPC_LD(treg, offset, areg) lwz treg, (offset+4)(areg) #endif +#endif /* IVPR must be 64KiB-aligned. */ #define VCPU_SIZE_ORDER 4