[linux] 04/06: [powerpc*] Fix missing CRC for _mcount

[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 1ca7f0fad2f318c01ff5e04c1a376184f643b922
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Feb 1 22:30:01 2017 +0000

    [powerpc*] Fix missing CRC for _mcount
---
 debian/changelog                                                      | 1 +
 .../powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch        | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 84d48e5..70a5a29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ linux (4.10~rc6-1~exp2) UNRELEASED; urgency=medium
     (might fix FTBFS)
   * [powerpc*] Fix various build failures:
     - Revert the initial stack protector support
+    - Fix missing CRC for _mcount
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 01 Feb 2017 22:13:06 +0000
 
diff --git a/debian/patches/bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch b/debian/patches/bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
index 2fc9ab7..13dd281 100644
--- a/debian/patches/bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
+++ b/debian/patches/bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
@@ -6,6 +6,7 @@ Forwarded: https://lkml.kernel.org/r/20161202023837.GK2697@decadent.org.uk
 Add declarations for:
 - __mfdcr, __mtdcr (if CONFIG_PPC_DCR_NATIVE=y; through <asm/dcr.h>)
 - switch_mmu_context (if CONFIG_PPC_BOOK3S_64=n; through <asm/mmu_context.h>)
+- _mcount (if CONFIG_FUNCTION_TRACER=y; though <asm/ftrace.h>)
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
@@ -14,12 +15,13 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 
 --- a/arch/powerpc/include/asm/asm-prototypes.h
 +++ b/arch/powerpc/include/asm/asm-prototypes.h
-@@ -17,6 +17,8 @@
+@@ -17,6 +17,9 @@
  #include <asm/checksum.h>
  #include <linux/uaccess.h>
  #include <asm/epapr_hcalls.h>
 +#include <asm/dcr.h>
 +#include <asm/mmu_context.h>
++#include <asm/ftrace.h>
  
  #include <uapi/asm/ucontext.h>
  

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