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

[Arnaud Patard]

Author: rtp-guest
Date: Tue Dec 13 08:15:07 2011
New Revision: 18385

Log:
Add arm_dma_zone_size fix as it should fix #651215

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/arm/nslu2-dma-size.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Dec 13 06:57:37 2011	(r18384)
+++ dists/sid/linux-2.6/debian/changelog	Tue Dec 13 08:15:07 2011	(r18385)
@@ -3,6 +3,9 @@
   [ Ben Hutchings ]
   * staging: r8712u: Add new USB ID (Closes: #651622)
 
+  [ Arnaud Patard ]
+  * arm: add arm_dma_zone_size setting fixe
+
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Dec 2011 05:50:44 +0000
 
 linux-2.6 (3.1.5-1) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/arm/nslu2-dma-size.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/nslu2-dma-size.patch	Tue Dec 13 08:15:07 2011	(r18385)
@@ -0,0 +1,40 @@
+Queued as http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7204%2F1
+
+arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier
+
+arm_dma_zone_size is used by arm_bootmem_free() which is called by
+paging_init(). Thus it needs to be set before calling it.
+
+Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+Acked-by: Nicolas Pitre <nico at linaro.org>
+CC: stable at kernel.org
+Index: linux-2.6/arch/arm/kernel/setup.c
+===================================================================
+--- linux-2.6.orig/arch/arm/kernel/setup.c	2011-12-11 17:48:29.000000000 +0100
++++ linux-2.6/arch/arm/kernel/setup.c	2011-12-11 17:57:03.000000000 +0100
+@@ -904,6 +904,12 @@ void __init setup_arch(char **cmdline_p)
+ 	machine_desc = mdesc;
+ 	machine_name = mdesc->name;
+ 
++#ifdef CONFIG_ZONE_DMA
++	if (mdesc->dma_zone_size) {
++		extern unsigned long arm_dma_zone_size;
++		arm_dma_zone_size = mdesc->dma_zone_size;
++	}
++#endif
+ 	if (mdesc->soft_reboot)
+ 		reboot_setup("s");
+ 
+@@ -934,12 +940,6 @@ void __init setup_arch(char **cmdline_p)
+ 
+ 	tcm_init();
+ 
+-#ifdef CONFIG_ZONE_DMA
+-	if (mdesc->dma_zone_size) {
+-		extern unsigned long arm_dma_zone_size;
+-		arm_dma_zone_size = mdesc->dma_zone_size;
+-	}
+-#endif
+ #ifdef CONFIG_MULTI_IRQ_HANDLER
+ 	handle_arch_irq = mdesc->handle_irq;
+ #endif

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Tue Dec 13 06:57:37 2011	(r18384)
+++ dists/sid/linux-2.6/debian/patches/series/base	Tue Dec 13 08:15:07 2011	(r18385)
@@ -87,3 +87,4 @@
 + bugfix/all/0005-staging-brcm80211-restrict-MIPS-dma-bug-workaround-t.patch
 + debian/inetpeer-hide-ABI-change-in-3.1.5.patch
 + features/all/staging-r8712u-Add-new-USB-ID.patch
++ bugfix/arm/nslu2-dma-size.patch