All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table
@ 2012-04-11 20:27 ` Scott Wood
  0 siblings, 0 replies; 6+ messages in thread
From: Scott Wood @ 2012-04-11 20:27 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: kvm, kvm-ppc, linuxppc-dev

e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, 
"powerpc: Add initial e6500 cpu support" and the introduction of
CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
"KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
table entry missing CPU_FTR_EMB_HV.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
Fixup patch for the KVM merge as requested by Marcelo.

 arch/powerpc/include/asm/cputable.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 67c34af..50d82c8 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -395,7 +395,7 @@ extern const char *powerpc_base_platform;
 #define CPU_FTRS_E6500	(CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \
 	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \
 	    CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
-	    CPU_FTR_DEBUG_LVL_EXC)
+	    CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV)
 #define CPU_FTRS_GENERIC_32	(CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)
 
 /* 64-bit CPUs */
-- 
1.7.7.rc3.4.g8d714

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table
@ 2012-04-11 20:27 ` Scott Wood
  0 siblings, 0 replies; 6+ messages in thread
From: Scott Wood @ 2012-04-11 20:27 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: linuxppc-dev, kvm-ppc, kvm

e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, 
"powerpc: Add initial e6500 cpu support" and the introduction of
CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
"KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
table entry missing CPU_FTR_EMB_HV.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
Fixup patch for the KVM merge as requested by Marcelo.

 arch/powerpc/include/asm/cputable.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 67c34af..50d82c8 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -395,7 +395,7 @@ extern const char *powerpc_base_platform;
 #define CPU_FTRS_E6500	(CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \
 	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \
 	    CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
-	    CPU_FTR_DEBUG_LVL_EXC)
+	    CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV)
 #define CPU_FTRS_GENERIC_32	(CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)
 
 /* 64-bit CPUs */
-- 
1.7.7.rc3.4.g8d714

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table
@ 2012-04-11 20:27 ` Scott Wood
  0 siblings, 0 replies; 6+ messages in thread
From: Scott Wood @ 2012-04-11 20:27 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: kvm, kvm-ppc, linuxppc-dev

e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, 
"powerpc: Add initial e6500 cpu support" and the introduction of
CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
"KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
table entry missing CPU_FTR_EMB_HV.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
Fixup patch for the KVM merge as requested by Marcelo.

 arch/powerpc/include/asm/cputable.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 67c34af..50d82c8 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -395,7 +395,7 @@ extern const char *powerpc_base_platform;
 #define CPU_FTRS_E6500	(CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \
 	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \
 	    CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
-	    CPU_FTR_DEBUG_LVL_EXC)
+	    CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV)
 #define CPU_FTRS_GENERIC_32	(CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)
 
 /* 64-bit CPUs */
-- 
1.7.7.rc3.4.g8d714


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table
  2012-04-11 20:27 ` Scott Wood
  (?)
@ 2012-04-13 15:29   ` Kumar Gala
  -1 siblings, 0 replies; 6+ messages in thread
From: Kumar Gala @ 2012-04-13 15:29 UTC (permalink / raw)
  To: Scott Wood; +Cc: Marcelo Tosatti, kvm, kvm-ppc, linuxppc-dev


On Apr 11, 2012, at 3:27 PM, Scott Wood wrote:

> e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, 
> "powerpc: Add initial e6500 cpu support" and the introduction of
> CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
> "KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
> table entry missing CPU_FTR_EMB_HV.
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> Fixup patch for the KVM merge as requested by Marcelo.
> 
> arch/powerpc/include/asm/cputable.h |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Kumar Gala <galak@kernel.crashing.org>

- k

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table
@ 2012-04-13 15:29   ` Kumar Gala
  0 siblings, 0 replies; 6+ messages in thread
From: Kumar Gala @ 2012-04-13 15:29 UTC (permalink / raw)
  To: Scott Wood; +Cc: Marcelo Tosatti, linuxppc-dev, kvm-ppc, kvm


On Apr 11, 2012, at 3:27 PM, Scott Wood wrote:

> e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, 
> "powerpc: Add initial e6500 cpu support" and the introduction of
> CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
> "KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
> table entry missing CPU_FTR_EMB_HV.
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> Fixup patch for the KVM merge as requested by Marcelo.
> 
> arch/powerpc/include/asm/cputable.h |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Kumar Gala <galak@kernel.crashing.org>

- k

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table
@ 2012-04-13 15:29   ` Kumar Gala
  0 siblings, 0 replies; 6+ messages in thread
From: Kumar Gala @ 2012-04-13 15:29 UTC (permalink / raw)
  To: Scott Wood; +Cc: Marcelo Tosatti, kvm, kvm-ppc, linuxppc-dev


On Apr 11, 2012, at 3:27 PM, Scott Wood wrote:

> e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, 
> "powerpc: Add initial e6500 cpu support" and the introduction of
> CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
> "KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
> table entry missing CPU_FTR_EMB_HV.
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> Fixup patch for the KVM merge as requested by Marcelo.
> 
> arch/powerpc/include/asm/cputable.h |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Kumar Gala <galak@kernel.crashing.org>

- k

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-13 15:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-11 20:27 [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table Scott Wood
2012-04-11 20:27 ` Scott Wood
2012-04-11 20:27 ` Scott Wood
2012-04-13 15:29 ` Kumar Gala
2012-04-13 15:29   ` Kumar Gala
2012-04-13 15:29   ` Kumar Gala

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.