[PARISC] Let PA-8900 processors boot

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

2 files changed, 4 insertions, 3 deletions

diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index 76d880dc4bae..daf58dd4ea07 100644
--- a/include/asm-parisc/hardware.h
+++ b/include/asm-parisc/hardware.h
@@ -31,7 +31,8 @@ enum cpu_type {
         pcxw    = 8, /* pa8500          pa 2.0  */
         pcxw_   = 9, /* pa8600  (w+)    pa 2.0  */
         pcxw2   = 10, /* pa8700         pa 2.0  */
-        mako    = 11  /* pa8800         pa 2.0  */
+        mako    = 11, /* pa8800         pa 2.0  */
+        mako2   = 12  /* pa8900         pa 2.0  */
 };
 
 extern char *cpu_name_version[][2]; /* mapping from enum cpu_type to strings */
diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h
index d2f396721d3e..0052dc926d91 100644
--- a/include/asm-parisc/processor.h
+++ b/include/asm-parisc/processor.h
@@ -334,8 +334,8 @@ extern unsigned long get_wchan(struct task_struct *p);
 static inline int parisc_requires_coherency(void)
 {
 #ifdef CONFIG_PA8X00
-        /* FIXME: also pa8900 - when we see one */
-        return boot_cpu_data.cpu_type == mako;
+        return (boot_cpu_data.cpu_type == mako) ||
+                (boot_cpu_data.cpu_type == mako2);
 #else
         return 0;
 #endif