Skip to content

Commit

Permalink
powerpc/mm/radix: Fix CONFIG_PPC_MMU_STD_64 typo
Browse files Browse the repository at this point in the history
It's CONFIG_PPC_STD_MMU_64 not ...
     CONFIG_PPC_MMU_STD_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>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
vrothberg authored and mpe committed May 11, 2016
1 parent 69dfbae commit bb03efe
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/powerpc/kernel/mce_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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. */
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit bb03efe

Please sign in to comment.