Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756679Ab3DYIWA (ORCPT ); Thu, 25 Apr 2013 04:22:00 -0400 Received: from intranet.asianux.com ([58.214.24.6]:50934 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756405Ab3DYIV6 (ORCPT ); Thu, 25 Apr 2013 04:21:58 -0400 X-Spam-Score: -100.8 Message-ID: <5178E775.4030409@asianux.com> Date: Thu, 25 Apr 2013 16:21:09 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Mike Qiu , Michael Neuling CC: Michael Ellerman , linuxppc-dev@lists.ozlabs.org, sfr@canb.auug.org.au, matt@ozlabs.org, linux-kernel@vger.kernel.org, paulus@samba.org, "Aneesh Kumar K.V" Subject: Re: [PATCH] PowerPC: kernel: compiling issue, make additional room in exception vector area References: <5177965D.9090406@linux.vnet.ibm.com> <20130424083142.GB26834@concordia> <51779941.8080403@linux.vnet.ibm.com> <30651.1366799858@ale.ozlabs.ibm.com> <1366807638.5911.2.camel@localhost> <5178816D.3000309@asianux.com> <5178ABA2.4030109@linux.vnet.ibm.com> <5178E6C3.4060603@asianux.com> In-Reply-To: <5178E6C3.4060603@asianux.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3301 Lines: 85 Hello Mike: Please try this patch, at least it can pass compiling with the config file which you provided under my cross-compiling envrionments. I do not give a running test now, so better to try to run the new kernel with this patch. Thanks. On 2013年04月25日 16:18, Chen Gang wrote: > > When CONFIG_KVM_BOOK3S_64_PR is enabled, > MASKABLE_EXCEPTION_PSERIES(0x900 ...) will includes __KVMTEST, it will > exceed 0x980 which STD_EXCEPTION_HV(0x980 ...) will use, it will cause > compiling issue. > > The related errors: > arch/powerpc/kernel/exceptions-64s.S: Assembler messages: > arch/powerpc/kernel/exceptions-64s.S:258: Error: attempt to move .org backwards > make[1]: *** [arch/powerpc/kernel/head_64.o] Error 1 > > > Signed-off-by: Chen Gang > --- > arch/powerpc/include/asm/kvm_asm.h | 2 +- > arch/powerpc/kernel/exceptions-64s.S | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h > index b9dd382..2c65bae 100644 > --- a/arch/powerpc/include/asm/kvm_asm.h > +++ b/arch/powerpc/include/asm/kvm_asm.h > @@ -86,7 +86,7 @@ > #define BOOK3S_INTERRUPT_PROGRAM 0x700 > #define BOOK3S_INTERRUPT_FP_UNAVAIL 0x800 > #define BOOK3S_INTERRUPT_DECREMENTER 0x900 > -#define BOOK3S_INTERRUPT_HV_DECREMENTER 0x980 > +#define BOOK3S_INTERRUPT_HV_DECREMENTER 0x988 > #define BOOK3S_INTERRUPT_SYSCALL 0xc00 > #define BOOK3S_INTERRUPT_TRACE 0xd00 > #define BOOK3S_INTERRUPT_H_DATA_STORAGE 0xe00 > diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S > index e789ee7..bb0e677 100644 > --- a/arch/powerpc/kernel/exceptions-64s.S > +++ b/arch/powerpc/kernel/exceptions-64s.S > @@ -255,7 +255,7 @@ hardware_interrupt_hv: > KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x800) > > MASKABLE_EXCEPTION_PSERIES(0x900, 0x900, decrementer) > - STD_EXCEPTION_HV(0x980, 0x982, hdecrementer) > + STD_EXCEPTION_HV(0x988, 0x982, hdecrementer) > > MASKABLE_EXCEPTION_PSERIES(0xa00, 0xa00, doorbell_super) > KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xa00) > @@ -698,7 +698,7 @@ machine_check_common: > > STD_EXCEPTION_COMMON_ASYNC(0x500, hardware_interrupt, do_IRQ) > STD_EXCEPTION_COMMON_ASYNC(0x900, decrementer, .timer_interrupt) > - STD_EXCEPTION_COMMON(0x980, hdecrementer, .hdec_interrupt) > + STD_EXCEPTION_COMMON(0x988, hdecrementer, .hdec_interrupt) > #ifdef CONFIG_PPC_DOORBELL > STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, .doorbell_exception) > #else > @@ -802,7 +802,7 @@ hardware_interrupt_relon_hv: > STD_RELON_EXCEPTION_PSERIES(0x4700, 0x700, program_check) > STD_RELON_EXCEPTION_PSERIES(0x4800, 0x800, fp_unavailable) > MASKABLE_RELON_EXCEPTION_PSERIES(0x4900, 0x900, decrementer) > - STD_RELON_EXCEPTION_HV(0x4980, 0x982, hdecrementer) > + STD_RELON_EXCEPTION_HV(0x4988, 0x982, hdecrementer) > MASKABLE_RELON_EXCEPTION_PSERIES(0x4a00, 0xa00, doorbell_super) > STD_RELON_EXCEPTION_PSERIES(0x4b00, 0xb00, trap_0b) > > -- Chen Gang Asianux Corporation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/