diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:16:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:16:20 -0400 |
| commit | e4d806377b069881f930089bf880918d3ad555ab (patch) | |
| tree | ed03416ddaa770bed16880ffea32b9b71dd5c7c7 /arch/sh/include | |
| parent | b50df7d1fb37eb6aea87590b391d7111fde87121 (diff) | |
| parent | 3f7581d66ece6b7ff643c8c817bfbd72cdbe9077 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
serial: sh-sci: remove duplicated #include
sh: Export uncached helper symbols.
sh: Fix up NUMA build for 29-bit.
serial: sh-sci: Fix build failure for non-sh architectures.
sh: Fix up uncached offset for legacy 29-bit mode.
sh: Support CPU affinity masks for INTC controllers.
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/mmu.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/sh/include/asm/mmu.h b/arch/sh/include/asm/mmu.h index 19fe84550b49..56e4418c19b9 100644 --- a/arch/sh/include/asm/mmu.h +++ b/arch/sh/include/asm/mmu.h | |||
| @@ -66,6 +66,13 @@ int pmb_unmap(void __iomem *addr); | |||
| 66 | 66 | ||
| 67 | #else | 67 | #else |
| 68 | 68 | ||
| 69 | static inline int | ||
| 70 | pmb_bolt_mapping(unsigned long virt, phys_addr_t phys, | ||
| 71 | unsigned long size, pgprot_t prot) | ||
| 72 | { | ||
| 73 | return -EINVAL; | ||
| 74 | } | ||
| 75 | |||
| 69 | static inline void __iomem * | 76 | static inline void __iomem * |
| 70 | pmb_remap_caller(phys_addr_t phys, unsigned long size, | 77 | pmb_remap_caller(phys_addr_t phys, unsigned long size, |
| 71 | pgprot_t prot, void *caller) | 78 | pgprot_t prot, void *caller) |