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

[Ben Hutchings]

Author: benh
Date: Sat Mar 12 03:29:30 2011
New Revision: 17042

Log:
[arm] Fix .size directive for xscale_dma_a0_map_area

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/arm-Fix-.size-directive-for-xscale_dma_a0_map_area.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	Sat Mar 12 02:18:54 2011	(r17041)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Mar 12 03:29:30 2011	(r17042)
@@ -4,6 +4,7 @@
 
   [ Ben Hutchings ]
   * [sparc] Fix .size directive for do_int_load
+  * [arm] Fix .size directive for xscale_dma_a0_map_area
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 09 Mar 2011 01:10:58 +0000
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/arm-Fix-.size-directive-for-xscale_dma_a0_map_area.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/arm-Fix-.size-directive-for-xscale_dma_a0_map_area.patch	Sat Mar 12 03:29:30 2011	(r17042)
@@ -0,0 +1,30 @@
+From 8d86d1ae529afe050dac5094a9155f553bb25090 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 12 Mar 2011 03:24:11 +0000
+Subject: [PATCH] arm: Fix .size directive for xscale_dma_a0_map_area
+
+gas used to accept (and ignore?) .size directives which referred to
+undefined symbols, as this does.  In binutils 2.21 these are treated
+as fatal errors.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/arm/mm/proc-xscale.S |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
+index 5a37c5e..ab00b59 100644
+--- a/arch/arm/mm/proc-xscale.S
++++ b/arch/arm/mm/proc-xscale.S
+@@ -395,7 +395,7 @@ ENTRY(xscale_dma_a0_map_area)
+ 	teq	r2, #DMA_TO_DEVICE
+ 	beq	xscale_dma_clean_range
+ 	b	xscale_dma_flush_range
+-ENDPROC(xscsale_dma_a0_map_area)
++ENDPROC(xscale_dma_a0_map_area)
+ 
+ /*
+  *	dma_unmap_area(start, size, dir)
+-- 
+1.7.4.1
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sat Mar 12 02:18:54 2011	(r17041)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sat Mar 12 03:29:30 2011	(r17042)
@@ -50,3 +50,4 @@
 + 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
++ bugfix/arm/arm-Fix-.size-directive-for-xscale_dma_a0_map_area.patch