path: root/arch
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-17 16:11:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-17 16:11:09 -0700
commit1ce6ec91a8528f80442eee7157be1b016248a883 (patch)
tree7a7f6ecf83016a4b9ff3bd357303e0e6b4f585a5 /arch
parent96d8683483b7eb194609edd1afe9143a0467b7d3 (diff)
parentb9e146d8eb3b9ecae5086d373b50fa0c1f3e7f0f (diff)
Merge branch 'akpm' (fixes from Andrew)
Pull misc fixes from Andrew Morton: "Ten fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: kernel/signal.c: stop info leak via the tkill and the tgkill syscalls mm/vmscan: fix error return in kswapd_run() hfsplus: fix potential overflow in hfsplus_file_truncate() avr32: fix build error in atstk1006_defconfig hugetlbfs: add swap entry check in follow_hugetlb_page() fs/binfmt_elf.c: fix hugetlb memory check in vma_dump_size() hugetlbfs: stop setting VM_DONTDUMP in initializing vma(VM_HUGETLB) checkpatch: fix stringification macro defect drivers/video/mmp/core.c: fix use-after-free bug thinkpad-acpi: kill hotkey_thread_mutex
Diffstat (limited to 'arch')
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h
index cf60d0a9f17..fc6483f83cc 100644
--- a/arch/avr32/include/asm/io.h
+++ b/arch/avr32/include/asm/io.h
@@ -165,6 +165,10 @@ BUILDIO_IOPORT(l, u32)
#define readw_be __raw_readw
#define readl_be __raw_readl
+#define writeb_relaxed writeb
+#define writew_relaxed writew
+#define writel_relaxed writel
#define writeb_be __raw_writeb
#define writew_be __raw_writew
#define writel_be __raw_writel