diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-07-10 12:29:25 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-28 14:10:26 +1000 |
| commit | 804ece07e957298fa15695677c92631744d620af (patch) | |
| tree | 51792a28d83a3b635dc91d1acbac94d2fa12fb3b /arch/powerpc/include/asm | |
| parent | 0f369103ce78c9948cfab8611031e6ac084b75a8 (diff) | |
| download | blackbird-op-linux-804ece07e957298fa15695677c92631744d620af.tar.gz blackbird-op-linux-804ece07e957298fa15695677c92631744d620af.zip | |
powerpc: Remove CONFIG_POWER4
Although the name CONFIG_POWER4 suggests that it controls support for
power4 cpus, this symbol is actually misnamed.
It is a historical wart from the powermac code, which used to support
building a 32-bit kernel for power4. CONFIG_POWER4 was used in that
context to guard code that was 64-bit only.
In the powermac code we can just use CONFIG_PPC64 instead, and in other
places it is a synonym for CONFIG_PPC_BOOK3S_64.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | 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 da5f9c417dc7..37feff3e19eb 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -268,7 +268,7 @@ extern const char *powerpc_base_platform; #endif #define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \ - !defined(CONFIG_POWER4) && !defined(CONFIG_BOOKE)) + !defined(CONFIG_BOOKE)) #define CPU_FTRS_PPC601 (CPU_FTR_COMMON | CPU_FTR_601 | \ CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE) |
