diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-03-27 16:47:49 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@athena.road.mcmartin.ca> | 2007-05-22 22:43:55 -0400 |
| commit | 2cbd42dbf8887c8742f8e6a286c7e5f4f5ddb56b (patch) | |
| tree | d9acbb13455e14bd953ca1581c68a582032cdf4d /include/asm-parisc | |
| parent | 27f282b9c6ec0c2ed64778ca154674929eefb195 (diff) | |
| download | op-kernel-dev-2cbd42dbf8887c8742f8e6a286c7e5f4f5ddb56b.zip op-kernel-dev-2cbd42dbf8887c8742f8e6a286c7e5f4f5ddb56b.tar.gz | |
[PARISC] Let PA-8900 processors boot
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc')
| -rw-r--r-- | include/asm-parisc/hardware.h | 3 | ||||
| -rw-r--r-- | include/asm-parisc/processor.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h index 76d880d..daf58dd 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 d2f3967..0052dc9 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 |
