From 30fbf01c2daf891a54c8bcd22f0d6590b60ade93 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Apr 2013 13:26:42 -0700 Subject: [PATCH] 3.8-stable patches added patches: s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch --- ...-io_remap_pfn_range-to-asm-pgtable.h.patch | 58 +++++++++++++++++++ queue-3.8/series | 1 + 2 files changed, 59 insertions(+) create mode 100644 queue-3.8/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch diff --git a/queue-3.8/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch b/queue-3.8/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch new file mode 100644 index 00000000000..b7ba238a2bf --- /dev/null +++ b/queue-3.8/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch @@ -0,0 +1,58 @@ +From 4f2e29031e6c67802e7370292dd050fd62f337ee Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Wed, 17 Apr 2013 08:46:19 -0700 +Subject: s390: move dummy io_remap_pfn_range() to asm/pgtable.h + +From: Linus Torvalds + +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 . + +The s390 choice of 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 +Cc: Martin Schwidefsky +Cc: Heiko Carstens +Signed-off-by: Greg Kroah-Hartman + +--- + 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__ */ + + /* diff --git a/queue-3.8/series b/queue-3.8/series index 75e426fd8c7..490c14fbb9e 100644 --- a/queue-3.8/series +++ b/queue-3.8/series @@ -38,3 +38,4 @@ vm-convert-fb_mmap-to-vm_iomap_memory-helper.patch vm-convert-hpet-mmap-to-vm_iomap_memory-helper.patch vm-convert-mtdchar-mmap-to-vm_iomap_memory-helper.patch btrfs-make-sure-nbytes-are-right-after-log-replay.patch +s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch -- 2.47.3