From 44a06962efd8f464bf60915e0238b64c226a21d3 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 29 Mar 2011 04:14:49 +0000
Subject: [PATCH] [hppa] Remove .size directive for flush_alias_page (should
 fix FTBFS)

svn path=/dists/sid/linux-2.6/; revision=17148
---
 debian/changelog                              |  1 +
 ....size-directive-for-flush_alias_page.patch | 31 +++++++++++++++++++
 debian/patches/series/2                       |  1 +
 3 files changed, 33 insertions(+)
 create mode 100644 debian/patches/bugfix/parisc/parisc-Remove-.size-directive-for-flush_alias_page.patch

diff --git a/debian/changelog b/debian/changelog
index 761d6a417..e1cd68a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ linux-2.6 (2.6.38-2) UNRELEASED; urgency=low
   * [x86] media/rc: Enable IR_WINBOND_CIR as module
   * [x86] Enable DEBUG_SET_MODULE_RONX (Closes: #619838)
   * SCSI: Enable TARGET_CORE and related modules (Closes: #619298)
+  * [hppa] Remove .size directive for flush_alias_page (should fix FTBFS)
 
   [ Jurij Smakov ]
   * Bump CONFIG_NR_CPUS on sparc to 256 to accomodate T2+ machines
diff --git a/debian/patches/bugfix/parisc/parisc-Remove-.size-directive-for-flush_alias_page.patch b/debian/patches/bugfix/parisc/parisc-Remove-.size-directive-for-flush_alias_page.patch
new file mode 100644
index 000000000..3355f5711
--- /dev/null
+++ b/debian/patches/bugfix/parisc/parisc-Remove-.size-directive-for-flush_alias_page.patch
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 29 Mar 2011 05:09:19 +0100
+Subject: [PATCH] parisc: Remove .size directive for flush_alias_page
+
+flush_alias_page is disabled with #if 0, but the .size directive for
+it is not.
+
+gas used to accept and ignore .size directives which referred to
+undefined symbols.  In binutils 2.21 these are treated as fatal
+errors.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ arch/parisc/kernel/pacache.S |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
+index 09b77b2..8332f3e 100644
+--- a/arch/parisc/kernel/pacache.S
++++ b/arch/parisc/kernel/pacache.S
+@@ -842,6 +842,7 @@ ENTRY(flush_alias_page)
+ 	.exit
+ 
+ 	.procend
++ENDPROC(flush_alias_page)
+ #endif
+ 
+ 	.export flush_user_dcache_range_asm
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series/2 b/debian/patches/series/2
index 8701f9a72..5ccb44544 100644
--- a/debian/patches/series/2
+++ b/debian/patches/series/2
@@ -6,3 +6,4 @@
 + bugfix/x86/KVM-remove-isr_ack-logic-from-PIC.patch
 - bugfix/x86/Correct-a-typo-in-async_page_fault-label.patch
 + bugfix/all/stable/2.6.38.2.patch
++ bugfix/parisc/parisc-Remove-.size-directive-for-flush_alias_page.patch