[linux] 01/03: Add necessary declarations of arch_wb_cache_pmem() in dax ABI patch

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 0b4bd142ab0382173a8668f3506450cb19f49b2e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Oct 27 23:33:54 2017 +0200

    Add necessary declarations of arch_wb_cache_pmem() in dax ABI patch
    
    Annoyingly, arch_wb_cache_pmem() isn't declared in any common header
    but only in drivers/nvdimm/pmem.h.
---
 debian/patches/debian/dax-avoid-abi-change-in-4.13.5.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/patches/debian/dax-avoid-abi-change-in-4.13.5.patch b/debian/patches/debian/dax-avoid-abi-change-in-4.13.5.patch
index 5da901b..7db92a4 100644
--- a/debian/patches/debian/dax-avoid-abi-change-in-4.13.5.patch
+++ b/debian/patches/debian/dax-avoid-abi-change-in-4.13.5.patch
@@ -17,7 +17,7 @@ callers.
 ---
 --- a/drivers/md/dm-linear.c
 +++ b/drivers/md/dm-linear.c
-@@ -184,6 +184,14 @@ static size_t linear_dax_copy_from_iter(
+@@ -184,6 +184,15 @@ static size_t linear_dax_copy_from_iter(
  	return dax_copy_from_iter(dax_dev, pgoff, addr, bytes, i);
  }
  
@@ -25,6 +25,7 @@ callers.
 +		size_t size)
 +{
 +#ifdef CONFIG_ARCH_HAS_PMEM_API
++	void arch_wb_cache_pmem(void *addr, size_t size);
 +	arch_wb_cache_pmem(addr, size);
 +#endif
 +}
@@ -42,7 +43,7 @@ callers.
  int __init dm_linear_init(void)
 --- a/drivers/md/dm-stripe.c
 +++ b/drivers/md/dm-stripe.c
-@@ -458,6 +458,14 @@ static void stripe_io_hints(struct dm_ta
+@@ -458,6 +458,15 @@ static void stripe_io_hints(struct dm_ta
  	blk_limits_io_opt(limits, chunk_size * sc->stripes);
  }
  
@@ -50,6 +51,7 @@ callers.
 +		size_t size)
 +{
 +#ifdef CONFIG_ARCH_HAS_PMEM_API
++	void arch_wb_cache_pmem(void *addr, size_t size);
 +	arch_wb_cache_pmem(addr, size);
 +#endif
 +}
@@ -67,7 +69,7 @@ callers.
  int __init dm_stripe_init(void)
 --- a/drivers/md/dm.c
 +++ b/drivers/md/dm.c
-@@ -993,6 +993,14 @@ static size_t dm_dax_copy_from_iter(stru
+@@ -993,6 +993,15 @@ static size_t dm_dax_copy_from_iter(stru
  	return ret;
  }
  
@@ -75,6 +77,7 @@ callers.
 +		size_t size)
 +{
 +#ifdef CONFIG_ARCH_HAS_PMEM_API
++	void arch_wb_cache_pmem(void *addr, size_t size);
 +	arch_wb_cache_pmem(addr, size);
 +#endif
 +}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git