summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2004-06-26 20:52:30 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-26 20:52:30 -0700
commit8dce5d70a4ecfb445b33569d93e99336c426e14a (patch)
treee11a25fc1ab4860cc1822a2d57fb10b5dae83a27 /include
parentedc5e57d7644f29c4f2d9d98ef20d250f2f27ffb (diff)
[PATCH] ppc64: fix oprofile on 970
- Use 970/970FX instead of GPUL - Add POWER5 and 970FX to systemcfg.h - Create new cpu feature CPU_FTR_MMCRA_SIHV and use it Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc64/cputable.h1
-rw-r--r--include/asm-ppc64/processor.h4
-rw-r--r--include/asm-ppc64/systemcfg.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-ppc64/cputable.h b/include/asm-ppc64/cputable.h
index abca635f9f9b..fa9b231ef3a3 100644
--- a/include/asm-ppc64/cputable.h
+++ b/include/asm-ppc64/cputable.h
@@ -131,6 +131,7 @@ extern firmware_feature_t firmware_features_table[];
#define CPU_FTR_SMT 0x0000010000000000
#define CPU_FTR_COHERENT_ICACHE 0x0000020000000000
#define CPU_FTR_LOCKLESS_TLBIE 0x0000040000000000
+#define CPU_FTR_MMCRA_SIHV 0x0000080000000000
/* Platform firmware features */
#define FW_FTR_ 0x0000000000000001
diff --git a/include/asm-ppc64/processor.h b/include/asm-ppc64/processor.h
index 265ad15da289..341c9513a67c 100644
--- a/include/asm-ppc64/processor.h
+++ b/include/asm-ppc64/processor.h
@@ -382,10 +382,10 @@
#define PV_ICESTAR 0x0036
#define PV_SSTAR 0x0037
#define PV_POWER4p 0x0038
-#define PV_GPUL 0x0039
+#define PV_970 0x0039
#define PV_POWER5 0x003A
#define PV_POWER5p 0x003B
-#define PV_GPULp 0x003C
+#define PV_970FX 0x003C
#define PV_630 0x0040
#define PV_630p 0x0041
diff --git a/include/asm-ppc64/systemcfg.h b/include/asm-ppc64/systemcfg.h
index 72b5adba9325..7cefeef2baa2 100644
--- a/include/asm-ppc64/systemcfg.h
+++ b/include/asm-ppc64/systemcfg.h
@@ -73,6 +73,8 @@ extern struct systemcfg *systemcfg;
#define PV_SSTAR 0x0037
#define PV_POWER4p 0x0038
#define PV_GPUL 0x0039
+#define PV_POWER5 0x003a
+#define PV_970FX 0x003c
#define PV_630 0x0040
#define PV_630p 0x0041