[hppa] Remove .size directive for flush_alias_page (should fix FTBFS)

svn path=/dists/sid/linux-2.6/; revision=17148
This commit is contained in:
Ben Hutchings 2011-03-29 04:14:49 +00:00
parent c1954819b5
commit 44a06962ef
3 changed files with 33 additions and 0 deletions

1
debian/changelog vendored
View File

@ -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

View File

@ -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

View File

@ -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