[linux] 02/03: swapops.h: Add #include to fix build failure on powerpc

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 6b46662b9490fe40704189d84382d861465ff6c3
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Feb 20 04:26:32 2016 +0000

    swapops.h: Add #include to fix build failure on powerpc
---
 debian/changelog                                   |  1 +
 ...dd-include-to-fix-build-failure-on-powerp.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0a3ed0b..de186c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (4.5~rc4-1~exp2) UNRELEASED; urgency=medium
 
   * [armel/versatile] Enable GPIOLIB, needed to build smc91x driver with
     OF enabled (fixes FTBFS)
+  * swapops.h: Add #include to fix build failure on powerpc
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 19 Feb 2016 02:02:22 +0000
 
diff --git a/debian/patches/bugfix/powerpc/swapops.h-add-include-to-fix-build-failure-on-powerp.patch b/debian/patches/bugfix/powerpc/swapops.h-add-include-to-fix-build-failure-on-powerp.patch
new file mode 100644
index 0000000..538e537
--- /dev/null
+++ b/debian/patches/bugfix/powerpc/swapops.h-add-include-to-fix-build-failure-on-powerp.patch
@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 20 Feb 2016 04:19:41 +0000
+Subject: swapops.h: Add #include to fix build failure on powerpc
+
+<linux/swapops.h> uses pte_swp_soft_dirty() and
+pte_swp_clear_soft_dirty(), which are defined by <ams/pgtable.h>.  It
+appears that in most cases it is either indirectly included or has
+previously been included.  However, as of 4.5-rc4 this is not the case
+when building kernel/power/swap.c in a 32-bit powerpc configuration.
+
+References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=powerpc&ver=4.5%7Erc4-1%7Eexp1&stamp=1455791718
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ include/linux/swapops.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/linux/swapops.h b/include/linux/swapops.h
+index 5c3a5f3e7eec..bac77160327f 100644
+--- a/include/linux/swapops.h
++++ b/include/linux/swapops.h
+@@ -3,6 +3,7 @@
+ 
+ #include <linux/radix-tree.h>
+ #include <linux/bug.h>
++#include <asm/pgtable.h>
+ 
+ /*
+  * swapcache pages are stored in the swapper_space radix tree.  We want to
diff --git a/debian/patches/series b/debian/patches/series
index 25d2420..fcc56e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -77,3 +77,4 @@ bugfix/x86/x86-efi-build-our-own-page-table-structures.patch
 bugfix/x86/x86-efi-setup-separate-efi-page-tables-in-kexec-path.patch
 debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
 bugfix/all/iff_no_queue-fix-for-drivers-not-calling-ether_setup.patch
+bugfix/powerpc/swapops.h-add-include-to-fix-build-failure-on-powerp.patch

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