diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-03 18:04:07 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-03 18:04:07 +0900 |
| commit | 286e050bc07a5ffcd7497e686c09b986d5ae6c6d (patch) | |
| tree | aa95ca5ccc7f083cf1d99c171f7e60676f1bb869 /include | |
| parent | 7d80fea4263d9a83ffedea448afa8510b05d04d0 (diff) | |
| parent | e86cbd8765bd2e1f9eeb209822449c9b1e5958cf (diff) | |
| download | lwn-286e050bc07a5ffcd7497e686c09b986d5ae6c6d.tar.gz lwn-286e050bc07a5ffcd7497e686c09b986d5ae6c6d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Recent bug fixes, one of them touches a common code file.
It adds two #ifndef/#endif pairs to asm-generic/io.h to be able to
override xlate_dev_kmem_ptr and xlate_dev_mem_ptr."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/pgtable: Fix gmap notifier address
s390/dasd: fix handling of gone paths
s390/pgtable: Fix check for pgste/storage key handling
arch: s390: appldata: using strncpy() and strnlen() instead of sprintf()
s390/smp: lost IPIs on cpu hotplug
kernel: Fix s390 absolute memory access for /dev/mem
s390/dma: do not call debug_dma after free
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/io.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index ac9da00e9f2c..d5afe96adba6 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -343,8 +343,12 @@ extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ #endif /* CONFIG_HAS_IOPORT */ +#ifndef xlate_dev_kmem_ptr #define xlate_dev_kmem_ptr(p) p +#endif +#ifndef xlate_dev_mem_ptr #define xlate_dev_mem_ptr(p) __va(p) +#endif #ifdef CONFIG_VIRT_TO_BUS #ifndef virt_to_bus |