diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2014-07-09 22:29:24 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-28 00:10:26 -0400 |
commit | 0f369103ce78c9948cfab8611031e6ac084b75a8 (patch) | |
tree | f697a2b19233d5bd91a82bb7426e77b23c8d7473 /arch | |
parent | 086dddc15fad9db098fc50a030c514696584ddfe (diff) |
powerpc: Remove power3 from comments
There are still a few occurences where it remains, because it helps to
explain something that persists.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/lib/copyuser_64.S | 3 | ||||
-rw-r--r-- | arch/powerpc/mm/mmu_context_hash32.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/ppc_mmu_32.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/lib/copyuser_64.S b/arch/powerpc/lib/copyuser_64.S index 0860ee46013c..f09899e35991 100644 --- a/arch/powerpc/lib/copyuser_64.S +++ b/arch/powerpc/lib/copyuser_64.S | |||
@@ -461,8 +461,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD) | |||
461 | /* | 461 | /* |
462 | * Routine to copy a whole page of data, optimized for POWER4. | 462 | * Routine to copy a whole page of data, optimized for POWER4. |
463 | * On POWER4 it is more than 50% faster than the simple loop | 463 | * On POWER4 it is more than 50% faster than the simple loop |
464 | * above (following the .Ldst_aligned label) but it runs slightly | 464 | * above (following the .Ldst_aligned label). |
465 | * slower on POWER3. | ||
466 | */ | 465 | */ |
467 | .Lcopy_page_4K: | 466 | .Lcopy_page_4K: |
468 | std r31,-32(1) | 467 | std r31,-32(1) |
diff --git a/arch/powerpc/mm/mmu_context_hash32.c b/arch/powerpc/mm/mmu_context_hash32.c index 78fef6726e10..aa5a7fd89461 100644 --- a/arch/powerpc/mm/mmu_context_hash32.c +++ b/arch/powerpc/mm/mmu_context_hash32.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * This file contains the routines for handling the MMU on those | 2 | * This file contains the routines for handling the MMU on those |
3 | * PowerPC implementations where the MMU substantially follows the | 3 | * PowerPC implementations where the MMU substantially follows the |
4 | * architecture specification. This includes the 6xx, 7xx, 7xxx, | 4 | * architecture specification. This includes the 6xx, 7xx, 7xxx, |
5 | * 8260, and POWER3 implementations but excludes the 8xx and 4xx. | 5 | * and 8260 implementations but excludes the 8xx and 4xx. |
6 | * -- paulus | 6 | * -- paulus |
7 | * | 7 | * |
8 | * Derived from arch/ppc/mm/init.c: | 8 | * Derived from arch/ppc/mm/init.c: |
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c index 11571e118831..5029dc19b517 100644 --- a/arch/powerpc/mm/ppc_mmu_32.c +++ b/arch/powerpc/mm/ppc_mmu_32.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * This file contains the routines for handling the MMU on those | 2 | * This file contains the routines for handling the MMU on those |
3 | * PowerPC implementations where the MMU substantially follows the | 3 | * PowerPC implementations where the MMU substantially follows the |
4 | * architecture specification. This includes the 6xx, 7xx, 7xxx, | 4 | * architecture specification. This includes the 6xx, 7xx, 7xxx, |
5 | * 8260, and POWER3 implementations but excludes the 8xx and 4xx. | 5 | * and 8260 implementations but excludes the 8xx and 4xx. |
6 | * -- paulus | 6 | * -- paulus |
7 | * | 7 | * |
8 | * Derived from arch/ppc/mm/init.c: | 8 | * Derived from arch/ppc/mm/init.c: |
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 798e6add1cae..018628104494 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
@@ -61,7 +61,7 @@ choice | |||
61 | help | 61 | help |
62 | There are two families of 64 bit PowerPC chips supported. | 62 | There are two families of 64 bit PowerPC chips supported. |
63 | The most common ones are the desktop and server CPUs | 63 | The most common ones are the desktop and server CPUs |
64 | (POWER3, RS64, POWER4, POWER5, POWER5+, POWER6, ...) | 64 | (POWER4, POWER5, 970, POWER5+, POWER6, POWER7, POWER8 ...) |
65 | 65 | ||
66 | The other are the "embedded" processors compliant with the | 66 | The other are the "embedded" processors compliant with the |
67 | "Book 3E" variant of the architecture | 67 | "Book 3E" variant of the architecture |