* [PATCH] powerpc/mm/radix: fix STD_MMU_64 typo
@ 2016-05-03 6:59 Valentin Rothberg
2016-05-03 9:13 ` Aneesh Kumar K.V
2016-05-04 22:40 ` Michael Ellerman
0 siblings, 2 replies; 3+ messages in thread
From: Valentin Rothberg @ 2016-05-03 6:59 UTC (permalink / raw)
To: aneesh.kumar, mpe; +Cc: linuxppc-dev, linux-kernel, Valentin Rothberg
s/MMU_STD_64/STD_MMU_64/
Fixes: 11ffc1cfa4c2 ("powerpc/mm/radix: Use STD_MMU_64 to properly
isolate hash related code")
Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com>
---
I only compile tested this change. The issue has been detected with
scripts/checkkconfigsymbols.py
arch/powerpc/kernel/mce_power.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c
index bec70338672e..7353991c4ece 100644
--- a/arch/powerpc/kernel/mce_power.c
+++ b/arch/powerpc/kernel/mce_power.c
@@ -80,7 +80,7 @@ void __flush_tlb_power9(unsigned int action)
/* flush SLBs and reload */
-#ifdef CONFIG_PPC_MMU_STD_64
+#ifdef CONFIG_PPC_STD_MMU_64
static void flush_and_reload_slb(void)
{
struct slb_shadow *slb;
@@ -125,7 +125,7 @@ static long mce_handle_derror(uint64_t dsisr, uint64_t slb_error_bits)
* reset the error bits whenever we handle them so that at the end
* we can check whether we handled all of them or not.
* */
-#ifdef CONFIG_PPC_MMU_STD_64
+#ifdef CONFIG_PPC_STD_MMU_64
if (dsisr & slb_error_bits) {
flush_and_reload_slb();
/* reset error bits */
@@ -157,7 +157,7 @@ static long mce_handle_common_ierror(uint64_t srr1)
switch (P7_SRR1_MC_IFETCH(srr1)) {
case 0:
break;
-#ifdef CONFIG_PPC_MMU_STD_64
+#ifdef CONFIG_PPC_STD_MMU_64
case P7_SRR1_MC_IFETCH_SLB_PARITY:
case P7_SRR1_MC_IFETCH_SLB_MULTIHIT:
/* flush and reload SLBs for SLB errors. */
@@ -184,7 +184,7 @@ static long mce_handle_ierror_p7(uint64_t srr1)
handled = mce_handle_common_ierror(srr1);
-#ifdef CONFIG_PPC_MMU_STD_64
+#ifdef CONFIG_PPC_STD_MMU_64
if (P7_SRR1_MC_IFETCH(srr1) == P7_SRR1_MC_IFETCH_SLB_BOTH) {
flush_and_reload_slb();
handled = 1;
@@ -332,7 +332,7 @@ static long mce_handle_ierror_p8(uint64_t srr1)
handled = mce_handle_common_ierror(srr1);
-#ifdef CONFIG_PPC_MMU_STD_64
+#ifdef CONFIG_PPC_STD_MMU_64
if (P7_SRR1_MC_IFETCH(srr1) == P8_SRR1_MC_IFETCH_ERAT_MULTIHIT) {
flush_and_reload_slb();
handled = 1;
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc/mm/radix: fix STD_MMU_64 typo
2016-05-03 6:59 [PATCH] powerpc/mm/radix: fix STD_MMU_64 typo Valentin Rothberg
@ 2016-05-03 9:13 ` Aneesh Kumar K.V
2016-05-04 22:40 ` Michael Ellerman
1 sibling, 0 replies; 3+ messages in thread
From: Aneesh Kumar K.V @ 2016-05-03 9:13 UTC (permalink / raw)
To: Valentin Rothberg, mpe; +Cc: linuxppc-dev, linux-kernel, Valentin Rothberg
Valentin Rothberg <valentinrothberg@gmail.com> writes:
> s/MMU_STD_64/STD_MMU_64/
>
> Fixes: 11ffc1cfa4c2 ("powerpc/mm/radix: Use STD_MMU_64 to properly
> isolate hash related code")
> Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
>
> I only compile tested this change. The issue has been detected with
> scripts/checkkconfigsymbols.py
>
> arch/powerpc/kernel/mce_power.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c
> index bec70338672e..7353991c4ece 100644
> --- a/arch/powerpc/kernel/mce_power.c
> +++ b/arch/powerpc/kernel/mce_power.c
> @@ -80,7 +80,7 @@ void __flush_tlb_power9(unsigned int action)
>
>
> /* flush SLBs and reload */
> -#ifdef CONFIG_PPC_MMU_STD_64
> +#ifdef CONFIG_PPC_STD_MMU_64
> static void flush_and_reload_slb(void)
> {
> struct slb_shadow *slb;
> @@ -125,7 +125,7 @@ static long mce_handle_derror(uint64_t dsisr, uint64_t slb_error_bits)
> * reset the error bits whenever we handle them so that at the end
> * we can check whether we handled all of them or not.
> * */
> -#ifdef CONFIG_PPC_MMU_STD_64
> +#ifdef CONFIG_PPC_STD_MMU_64
> if (dsisr & slb_error_bits) {
> flush_and_reload_slb();
> /* reset error bits */
> @@ -157,7 +157,7 @@ static long mce_handle_common_ierror(uint64_t srr1)
> switch (P7_SRR1_MC_IFETCH(srr1)) {
> case 0:
> break;
> -#ifdef CONFIG_PPC_MMU_STD_64
> +#ifdef CONFIG_PPC_STD_MMU_64
> case P7_SRR1_MC_IFETCH_SLB_PARITY:
> case P7_SRR1_MC_IFETCH_SLB_MULTIHIT:
> /* flush and reload SLBs for SLB errors. */
> @@ -184,7 +184,7 @@ static long mce_handle_ierror_p7(uint64_t srr1)
>
> handled = mce_handle_common_ierror(srr1);
>
> -#ifdef CONFIG_PPC_MMU_STD_64
> +#ifdef CONFIG_PPC_STD_MMU_64
> if (P7_SRR1_MC_IFETCH(srr1) == P7_SRR1_MC_IFETCH_SLB_BOTH) {
> flush_and_reload_slb();
> handled = 1;
> @@ -332,7 +332,7 @@ static long mce_handle_ierror_p8(uint64_t srr1)
>
> handled = mce_handle_common_ierror(srr1);
>
> -#ifdef CONFIG_PPC_MMU_STD_64
> +#ifdef CONFIG_PPC_STD_MMU_64
> if (P7_SRR1_MC_IFETCH(srr1) == P8_SRR1_MC_IFETCH_ERAT_MULTIHIT) {
> flush_and_reload_slb();
> handled = 1;
> --
> 2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: powerpc/mm/radix: fix STD_MMU_64 typo
2016-05-03 6:59 [PATCH] powerpc/mm/radix: fix STD_MMU_64 typo Valentin Rothberg
2016-05-03 9:13 ` Aneesh Kumar K.V
@ 2016-05-04 22:40 ` Michael Ellerman
1 sibling, 0 replies; 3+ messages in thread
From: Michael Ellerman @ 2016-05-04 22:40 UTC (permalink / raw)
To: Valentin Rothberg, aneesh.kumar
Cc: linuxppc-dev, linux-kernel, Valentin Rothberg
On Tue, 2016-03-05 at 06:59:27 UTC, Valentin Rothberg wrote:
> s/MMU_STD_64/STD_MMU_64/
>
> Fixes: 11ffc1cfa4c2 ("powerpc/mm/radix: Use STD_MMU_64 to properly
> isolate hash related code")
> Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com>
> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/ce7da681b8fdb374a401652a93
cheers
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-04 22:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-03 6:59 [PATCH] powerpc/mm/radix: fix STD_MMU_64 typo Valentin Rothberg
2016-05-03 9:13 ` Aneesh Kumar K.V
2016-05-04 22:40 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).