This is a note to let you know that I've just added the patch titled
s390: move dummy io_remap_pfn_range() to asm/pgtable.h
to the 3.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch
and it can be found in the queue-3.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 4f2e29031e6c67802e7370292dd050fd62f337ee Mon Sep 17 00:00:00 2001
From: Linus Torvalds <[email protected]>
Date: Wed, 17 Apr 2013 08:46:19 -0700
Subject: s390: move dummy io_remap_pfn_range() to asm/pgtable.h
From: Linus Torvalds <[email protected]>
commit 4f2e29031e6c67802e7370292dd050fd62f337ee upstream.
Commit b4cbb197c7e7 ("vm: add vm_iomap_memory() helper function") added
a helper function wrapper around io_remap_pfn_range(), and every other
architecture defined it in <asm/pgtable.h>.
The s390 choice of <asm/io.h> may make sense, but is not very convenient
for this case, and gratuitous differences like that cause unexpected errors
like this:
mm/memory.c: In function 'vm_iomap_memory':
mm/memory.c:2439:2: error: implicit declaration of function
'io_remap_pfn_range' [-Werror=implicit-function-declaration]
Glory be the kbuild test robot who noticed this, bisected it, and
reported it to the guilty parties (ie me).
Signed-off-by: Linus Torvalds <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: Heiko Carstens <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/s390/include/asm/io.h | 4 ----
arch/s390/include/asm/pgtable.h | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h
@@ -50,10 +50,6 @@ void unxlate_dev_mem_ptr(unsigned long p
#define ioremap_nocache(addr, size) ioremap(addr, size)
#define ioremap_wc ioremap_nocache
-/* TODO: s390 cannot support io_remap_pfn_range... */
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
- remap_pfn_range(vma, vaddr, pfn, size, prot)
-
static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
{
return (void __iomem *) offset;
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -56,6 +56,10 @@ extern unsigned long zero_page_mask;
(((unsigned long)(vaddr)) &zero_page_mask))))
#define __HAVE_COLOR_ZERO_PAGE
+/* TODO: s390 cannot support io_remap_pfn_range... */
+#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
+ remap_pfn_range(vma, vaddr, pfn, size, prot)
+
#endif /* !__ASSEMBLY__ */
/*
Patches currently in stable-queue which might be from
[email protected] are
queue-3.8/vm-convert-snd_pcm_lib_mmap_iomem-to-vm_iomap_memory-helper.patch
queue-3.8/fs-binfmt_elf.c-fix-hugetlb-memory-check-in-vma_dump_size.patch
queue-3.8/hugetlbfs-add-swap-entry-check-in-follow_hugetlb_page.patch
queue-3.8/hugetlbfs-stop-setting-vm_dontdump-in-initializing-vma-vm_hugetlb.patch
queue-3.8/kernel-signal.c-stop-info-leak-via-the-tkill-and-the-tgkill-syscalls.patch
queue-3.8/hfsplus-fix-potential-overflow-in-hfsplus_file_truncate.patch
queue-3.8/vm-convert-fb_mmap-to-vm_iomap_memory-helper.patch
queue-3.8/vm-convert-mtdchar-mmap-to-vm_iomap_memory-helper.patch
queue-3.8/vm-convert-hpet-mmap-to-vm_iomap_memory-helper.patch
queue-3.8/vm-add-vm_iomap_memory-helper-function.patch
queue-3.8/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
