Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2406f606 authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Dont set 32bit cputable bits on 64bit 



Milton and I were looking at the cputable code and it looks like we can
set spurious bits on 64bit.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 4b703a23

include/asm-powerpc/cputable.h

+11 −9
Original line number Diff line number Diff line
@@ -311,6 +311,11 @@ enum { 
#endif



	CPU_FTRS_POSSIBLE =

#ifdef __powerpc64__

	    CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |

	    CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_CELL |

            CPU_FTR_CI_LARGE_PAGE |

#else

#if CLASSIC_PPC

	    CPU_FTRS_PPC601 | CPU_FTRS_603 | CPU_FTRS_604 | CPU_FTRS_740_NOTAU |

	    CPU_FTRS_740 | CPU_FTRS_750 | CPU_FTRS_750FX1 |
@@ -344,14 +349,14 @@ enum { 
#ifdef CONFIG_E500

	    CPU_FTRS_E500 | CPU_FTRS_E500_2 |

#endif

#ifdef __powerpc64__

	    CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |

	    CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_CELL |

            CPU_FTR_CI_LARGE_PAGE |

#endif

#endif /* __powerpc64__ */

	    0,



	CPU_FTRS_ALWAYS =

#ifdef __powerpc64__

	    CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &

	    CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_CELL &

#else

#if CLASSIC_PPC

	    CPU_FTRS_PPC601 & CPU_FTRS_603 & CPU_FTRS_604 & CPU_FTRS_740_NOTAU &

	    CPU_FTRS_740 & CPU_FTRS_750 & CPU_FTRS_750FX1 &
@@ -385,10 +390,7 @@ enum { 
#ifdef CONFIG_E500

	    CPU_FTRS_E500 & CPU_FTRS_E500_2 &

#endif

#ifdef __powerpc64__

	    CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &

	    CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_CELL &

#endif

#endif /* __powerpc64__ */

	    CPU_FTRS_POSSIBLE,

};