[arm] setup: initialize arm_dma_zone_size earlier (Closes: #651215)
svn path=/dists/trunk/linux-2.6/; revision=18386
This commit is contained in:
parent
88a1c0f2df
commit
93a7026d1b
|
@ -12,6 +12,9 @@ linux-2.6 (3.2~rc5-1~experimental.1) UNRELEASED; urgency=low
|
|||
[ 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@decadent.org.uk> Tue, 06 Dec 2011 04:31:19 +0000
|
||||
|
||||
linux-2.6 (3.2~rc4-1~experimental.1) experimental; urgency=low
|
||||
|
|
51
debian/patches/bugfix/arm/ARM-7204-1-arch-arm-kernel-setup.c-initialize-arm_dm.patch
vendored
Normal file
51
debian/patches/bugfix/arm/ARM-7204-1-arch-arm-kernel-setup.c-initialize-arm_dm.patch
vendored
Normal file
|
@ -0,0 +1,51 @@
|
|||
From: Arnaud Patard <arnaud.patard@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@rtp-net.org>
|
||||
Acked-by: Nicolas Pitre <nico@linaro.org>
|
||||
Cc: stable@kernel.org
|
||||
Signed-off-by: Russell King <rmk+kernel@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
|
||||
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue