From: Michael Neuling <mikey@neuling.org>
To: paulus@samba.org
Cc: linuxppc-dev@ozlabs.org, anton@samba.org
Subject: [PATCH] minor POWER6 cputable cleanup
Date: Mon, 22 Jan 2007 13:21:26 +1100 [thread overview]
Message-ID: <9201.1169432486@neuling.org> (raw)
Merge CPU_FTR_POWER6 and CPU_FTR_POWER6X definitions.
---
include/asm-powerpc/cputable.h | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
Paulus, I'm not sure if it makes sense to define a CPU_FTR_POWER6_BASE
then create POWER6 and POWER6X from this or, base POWER6X off POWER6 (as
I've done here).
Either way, this is for the 2.6.21 merge window.
Index: kernel/include/asm-powerpc/cputable.h
===================================================================
--- kernel.orig/include/asm-powerpc/cputable.h
+++ kernel/include/asm-powerpc/cputable.h
@@ -337,12 +337,7 @@ extern void do_feature_fixups(unsigned l
CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \
CPU_FTR_DSCR)
-#define CPU_FTRS_POWER6X (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
- CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
- CPU_FTR_MMCRA | CPU_FTR_SMT | \
- CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
- CPU_FTR_PURR | CPU_FTR_CI_LARGE_PAGE | \
- CPU_FTR_SPURR | CPU_FTR_REAL_LE | CPU_FTR_DSCR)
+#define CPU_FTRS_POWER6X (CPU_FTRS_POWER6 | CPU_FTR_CI_LARGE_PAGE)
#define CPU_FTRS_CELL (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
next reply other threads:[~2007-01-22 2:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-22 2:21 Michael Neuling [this message]
2007-01-22 6:45 ` [PATCH] minor POWER6 cputable cleanup Michael Neuling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9201.1169432486@neuling.org \
--to=mikey@neuling.org \
--cc=anton@samba.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.