diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-31 22:38:38 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-31 22:38:38 +0400 |
| commit | 75eaff010547c55256f807700277365ee07d2a58 (patch) | |
| tree | ccae772c0e3a20e3b52156786bed8ea8d350f4ba /arch/mips/include/asm/mach-generic/spaces.h | |
| parent | f66d95d69db3a329354bf29ebe5fc73862d2c60a (diff) | |
| parent | ff5fadaff39180dc0b652753b5614a564711be29 (diff) | |
| download | linux-75eaff010547c55256f807700277365ee07d2a58.tar.xz | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- BMIPS SMP fixes
- a build fix necessary for older compilers
- two more bugs found my Chandras' testing
- and one more build fix
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: BMIPS: fix slave CPU booting when physical CPU is not 0
MIPS: BMIPS: do not change interrupt routing depending on boot CPU
MIPS: powertv: Fix arguments for free_reserved_area()
MIPS: Set default CPU type for BCM47XX platforms
MIPS: uapi/asm/siginfo.h: Fix GCC 4.1.2 compilation
MIPS: Fix multiple definitions of UNCAC_BASE.
Diffstat (limited to 'arch/mips/include/asm/mach-generic/spaces.h')
| -rw-r--r-- | arch/mips/include/asm/mach-generic/spaces.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index 5b2f2e68e57f..9488fa5f8866 100644 --- a/arch/mips/include/asm/mach-generic/spaces.h +++ b/arch/mips/include/asm/mach-generic/spaces.h @@ -25,8 +25,12 @@ #else #define CAC_BASE _AC(0x80000000, UL) #endif +#ifndef IO_BASE #define IO_BASE _AC(0xa0000000, UL) +#endif +#ifndef UNCAC_BASE #define UNCAC_BASE _AC(0xa0000000, UL) +#endif #ifndef MAP_BASE #ifdef CONFIG_KVM_GUEST |