diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-07 11:04:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-07 11:04:30 +0300 |
| commit | d34dd82905fb8e1117b67ab6c32989f88cfa0ba8 (patch) | |
| tree | 9e39651b66ad2b7679c50e6392ce7b92c359f5e2 /arch/sparc/include | |
| parent | 2bf05fa03ea10e7dcfd38cc8643bbb29c3ad6f9e (diff) | |
| download | linux-d34dd82905fb8e1117b67ab6c32989f88cfa0ba8.tar.xz | |
sparc: unify kernel/cpu
o use cpu_32.c as base
o move all sparc64 definitions to the common cpu.c
o use ifdef for the parts that differs and use cpu_32 as base
o spitfire.h required a CONFIG_SPARC64 guard to fix build on 32 bit
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/spitfire.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h index 985ea7e31992..f0d0c40c44da 100644 --- a/arch/sparc/include/asm/spitfire.h +++ b/arch/sparc/include/asm/spitfire.h @@ -6,6 +6,8 @@ #ifndef _SPARC64_SPITFIRE_H #define _SPARC64_SPITFIRE_H +#ifdef CONFIG_SPARC64 + #include <asm/asi.h> /* The following register addresses are accessible via ASI_DMMU @@ -338,5 +340,5 @@ static inline void cheetah_put_itlb_data(int entry, unsigned long data) } #endif /* !(__ASSEMBLY__) */ - +#endif /* CONFIG_SPARC64 */ #endif /* !(_SPARC64_SPITFIRE_H) */ |