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

[Ben Hutchings]

Author: benh
Date: Wed Dec 14 02:20:40 2011
New Revision: 18386

Log:
[arm] setup: initialize arm_dma_zone_size earlier (Closes: #651215)

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-7204-1-arch-arm-kernel-setup.c-initialize-arm_dm.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	Tue Dec 13 08:15:07 2011	(r18385)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Dec 14 02:20:40 2011	(r18386)
@@ -12,6 +12,9 @@
   [ Uwe Kleine-König ]
   * [amd64] Update rt featureset to 3.2-rc4-rt6
 
+  [ Arnaud Patard ]
+  * [arm] setup: initialize arm_dma_zone_size earlier (Closes: #651215)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 06 Dec 2011 04:31:19 +0000
 
 linux-2.6 (3.2~rc4-1~experimental.1) experimental; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-7204-1-arch-arm-kernel-setup.c-initialize-arm_dm.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-7204-1-arch-arm-kernel-setup.c-initialize-arm_dm.patch	Wed Dec 14 02:20:40 2011	(r18386)
@@ -0,0 +1,51 @@
+From: Arnaud Patard <arnaud.patard at rtp-net.org>
+Date: Sun, 11 Dec 2011 20:32:25 +0100
+Subject: [PATCH] ARM: 7204/1: arch/arm/kernel/setup.c: initialize
+ arm_dma_zone_size earlier
+
+commit 9811ccdfa94b4773c8030569bd8ec75eafa485ac upstream.
+
+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
+Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+---
+ arch/arm/kernel/setup.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
+index 1bdd0ad..8fc2c8f 100644
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -902,6 +902,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");
+ 
+@@ -932,12 +938,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
+-- 
+1.7.7.3
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Tue Dec 13 08:15:07 2011	(r18385)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Wed Dec 14 02:20:40 2011	(r18386)
@@ -56,3 +56,4 @@
 
 + features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
 + features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
++ bugfix/arm/ARM-7204-1-arch-arm-kernel-setup.c-initialize-arm_dm.patch