diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 20:05:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 20:05:07 -0700 |
| commit | 82b35f376c71fbd60f5ea0ce27b3c835fa50ed6d (patch) | |
| tree | 903ad77762684699b9135d6b82ef959951d95806 /arch | |
| parent | b0de415aa7469606ddf618caf3e2fdc94fa28733 (diff) | |
| parent | 61e86cc90af49cecef9c54ccea1f572fbcb695ac (diff) | |
| download | linux-82b35f376c71fbd60f5ea0ce27b3c835fa50ed6d.tar.gz linux-82b35f376c71fbd60f5ea0ce27b3c835fa50ed6d.tar.bz2 linux-82b35f376c71fbd60f5ea0ce27b3c835fa50ed6d.zip | |
Merge tag 'tty-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver fixes from Greg KH:
"Here are a number of small serial and tty fixes for reported issues.
All have been in linux-next successfully"
* tag 'tty-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: vt: Fix !TASK_RUNNING diagnostic warning from paste_selection()
serial: core: Fix crashes while echoing when closing
m32r: Add ioreadXX/iowriteXX big-endian mmio accessors
Revert "serial: imx: initialized DMA w/o HW flow enabled"
sc16is7xx: fix FIFO address of secondary UART
sc16is7xx: fix Kconfig dependencies
serial: etraxfs-uart: Fix release etraxfs_uart_ports
tty/vt: Fix the memory leak in visual_init
serial: amba-pl011: Fix devm_ioremap_resource return value check
n_tty: signal and flush atomically
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m32r/include/asm/io.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h index 0c3f25ee3381..f8de767ce2bc 100644 --- a/arch/m32r/include/asm/io.h +++ b/arch/m32r/include/asm/io.h @@ -174,6 +174,11 @@ static inline void _writel(unsigned long l, unsigned long addr) #define iowrite16 writew #define iowrite32 writel +#define ioread16be(addr) be16_to_cpu(readw(addr)) +#define ioread32be(addr) be32_to_cpu(readl(addr)) +#define iowrite16be(v, addr) writew(cpu_to_be16(v), (addr)) +#define iowrite32be(v, addr) writel(cpu_to_be32(v), (addr)) + #define mmiowb() #define flush_write_buffers() do { } while (0) /* M32R_FIXME */ |