diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 09:34:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 09:34:52 -0700 |
| commit | 1442138372d19907473cfc82c37e8dd7c3359034 (patch) | |
| tree | d2ee2a1ddc5e608034e273b246269ebd696c410e /arch/sh/kernel/io_generic.c | |
| parent | 902ff186114b50c859c46ac762d4b1e6223991d3 (diff) | |
| parent | a2767cfb1d9d97c3f861743f1ad595a80b75ec99 (diff) | |
| download | op-kernel-dev-1442138372d19907473cfc82c37e8dd7c3359034.zip op-kernel-dev-1442138372d19907473cfc82c37e8dd7c3359034.tar.gz | |
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Don't allocate smaller sized mappings on every iteration
sh: Try PMB mapping based on physical address, not mapping size
sh: Plug PMB alloc memory leak
sh: Sprinkle __uses_jump_to_uncached
sh: enable sleep state LEDs on Ecovec24
usb: r8a66597-udc unaligned fifo fix
sh: mach-ecovec24: Document DS2 switch settings.
sh: Build fix: export __movmem
sh: Disable unaligned kernel access printks by default.
sh: mach-ecovec24: modify 1st MTD area to read only
sh: mach-ecovec24: Add TouchScreen support
sh: magicpanelr2 and dreamcast can use the generic I/O base.
sh: Don't enable interrupts in the page fault path
sh: Set the default I/O port base to P2SEG.
sh: Handle ioport_map() cases for >= P1SEG addresses.
Diffstat (limited to 'arch/sh/kernel/io_generic.c')
| -rw-r--r-- | arch/sh/kernel/io_generic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/kernel/io_generic.c b/arch/sh/kernel/io_generic.c index 4ff5072..b8fa652 100644 --- a/arch/sh/kernel/io_generic.c +++ b/arch/sh/kernel/io_generic.c @@ -147,6 +147,9 @@ void generic_outsl(unsigned long port, const void *src, unsigned long count) void __iomem *generic_ioport_map(unsigned long addr, unsigned int size) { + if (PXSEG(addr) >= P1SEG) + return (void __iomem *)addr; + return (void __iomem *)(addr + generic_io_base); } |
