[kernel] r17028 - in dists/trunk/linux-2.6/debian: . patches/bugfix/sparc patches/series

[Ben Hutchings]

Author: benh
Date: Wed Mar  9 02:32:53 2011
New Revision: 17028

Log:
[sparc] Fix .size directive for do_int_load

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-.size-directive-for-do_int_load.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Mar  9 02:29:12 2011	(r17027)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Mar  9 02:32:53 2011	(r17028)
@@ -2,6 +2,9 @@
 
   * New upstream release candidate
 
+  [ Ben Hutchings ]
+  * [sparc] Fix .size directive for do_int_load
+
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 09 Mar 2011 01:10:58 +0000
 
 linux-2.6 (2.6.38~rc7-1~experimental.1) experimental; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-.size-directive-for-do_int_load.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-.size-directive-for-do_int_load.patch	Wed Mar  9 02:32:53 2011	(r17028)
@@ -0,0 +1,30 @@
+From bceadea9e7409bc2d7b35f9e55adea04405d1a09 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 8 Mar 2011 23:45:39 +0000
+Subject: [PATCH 3/5] sparc: Fix .size directive for do_int_load
+
+gas used to accept (and ignore?) .size directives which referred to
+undefined symbols, as this does.  In binutils 2.21 these are treated
+as errors.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/sparc/kernel/una_asm_64.S |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/sparc/kernel/una_asm_64.S b/arch/sparc/kernel/una_asm_64.S
+index be183fe..1c8d332 100644
+--- a/arch/sparc/kernel/una_asm_64.S
++++ b/arch/sparc/kernel/una_asm_64.S
+@@ -127,7 +127,7 @@ do_int_load:
+ 	wr	%o5, 0x0, %asi
+ 	retl
+ 	 mov	0, %o0
+-	.size	__do_int_load, .-__do_int_load
++	.size	do_int_load, .-do_int_load
+ 
+ 	.section	__ex_table,"a"
+ 	.word		4b, __retl_efault
+-- 
+1.7.4.1
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Wed Mar  9 02:29:12 2011	(r17027)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Wed Mar  9 02:32:53 2011	(r17028)
@@ -49,3 +49,4 @@
 + features/all/vt6656-Use-request_firmware-to-load-firmware.patch
 + features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
 + bugfix/all/media-DiB7000M-add-pid-filtering.patch
++ bugfix/sparc/sparc-Fix-.size-directive-for-do_int_load.patch