[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20130712103423.93102f3d08d1644cf3e59256@canb.auug.org.au>
Date: Fri, 12 Jul 2013 10:34:23 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Russell King <rmk@....linux.org.uk>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Jiang Liu <liuj97@...il.com>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the arm-current tree with Linus' tree
Hi Russell,
Today's linux-next merge of the arm-current tree got a conflict in
arch/arm/mm/init.c between commit dbe67df4ba78 ("mm: enhance
free_reserved_area() to support poisoning memory with zero") from Linus'
tree and commit 319e0b4f02f7 ("ARM: mm: fix boot on SA1110 Assabet") from
the arm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/arm/mm/init.c
index 6833cbe,0ecc43f..0000000
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -597,7 -600,7 +597,7 @@@ void __init mem_init(void
#ifdef CONFIG_SA1111
/* now that our DMA memory is actually so designated, we can free it */
- free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, -1, NULL);
- free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, 0, NULL);
++ free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, -1, NULL);
#endif
free_highpages();
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists