public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Chen Gang <gang.chen@asianux.com>
To: Mike Qiu <qiudayu@linux.vnet.ibm.com>,
	Michael Neuling <mikey@neuling.org>
Cc: Michael Ellerman <michael@ellerman.id.au>,
	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" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH] PowerPC: kernel: compiling issue, make additional room in exception vector area
Date: Thu, 25 Apr 2013 16:18:11 +0800	[thread overview]
Message-ID: <5178E6C3.4060603@asianux.com> (raw)
In-Reply-To: <5178ABA2.4030109@linux.vnet.ibm.com>


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 <gang.chen@asianux.com>
---
 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)
 
-- 
1.7.7.6

  parent reply	other threads:[~2013-04-25  8:19 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-24  8:22 "attempt to move .org backwards" still show up Mike Qiu
2013-04-24  8:31 ` Michael Ellerman
2013-04-24  8:35   ` Mike Qiu
2013-04-24 10:37     ` Michael Neuling
2013-04-24 12:47       ` Mike
2013-04-25  1:05         ` Chen Gang
2013-04-25  4:05           ` Mike Qiu
2013-04-25  5:36             ` Chen Gang
2013-04-25  7:23               ` Chen Gang
2013-04-25  6:25             ` Paul Mackerras
2013-04-25 11:16               ` Chen Gang
2013-04-26  1:58                 ` Mike Qiu
2013-04-26  2:05                   ` Chen Gang
2013-04-25 11:51               ` [PATCH v2] PowerPC: kernel: compiling issue, make additional room in exception vector area Chen Gang
2013-04-25 11:58                 ` Chen Gang
2013-04-25 23:16                 ` Michael Neuling
2013-04-26  1:06                   ` Chen Gang
2013-04-26  1:18                     ` Chen Gang
2013-04-26  1:36                       ` Chen Gang
2013-04-26  2:03                         ` Mike Qiu
2013-04-26  2:06                           ` Chen Gang
2013-04-26  3:08                             ` Mike Qiu
2013-04-26  3:25                               ` Chen Gang
2013-04-26  3:42                                 ` Chen Gang
2013-04-26  3:54                                   ` Mike Qiu
2013-04-27  9:28                                     ` Chen Gang F T
2013-04-27  9:32                                       ` Mike Qiu
2013-04-27  9:33                                         ` Chen Gang
2013-04-26  3:19               ` "attempt to move .org backwards" still show up Mike Qiu
2013-04-25  8:18             ` Chen Gang [this message]
2013-04-25  8:21               ` [PATCH] PowerPC: kernel: compiling issue, make additional room in exception vector area Chen Gang
2013-04-25  8:24                 ` Mike Qiu
2013-04-25  9:00               ` Michael Neuling
2013-04-25  9:05                 ` Chen Gang
2013-04-25  9:30                   ` Chen Gang
2013-04-24  8:36   ` "attempt to move .org backwards" still show up Mike Qiu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5178E6C3.4060603@asianux.com \
    --to=gang.chen@asianux.com \
    --cc=aneesh.kumar@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=matt@ozlabs.org \
    --cc=michael@ellerman.id.au \
    --cc=mikey@neuling.org \
    --cc=paulus@samba.org \
    --cc=qiudayu@linux.vnet.ibm.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox