linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [patch 1/1] arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier
Date: Sat, 10 Dec 2011 21:38:36 +0000	[thread overview]
Message-ID: <20111210213836.GP14542@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20111208213131.407903305@rtp-net.org>

On Thu, Dec 08, 2011 at 10:31:09PM +0100, Arnaud Patard wrote:
> 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 at kernel.org
> Index: linux-2.6/arch/arm/kernel/setup.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/kernel/setup.c	2011-12-08 22:17:01.000000000 +0100
> +++ linux-2.6/arch/arm/kernel/setup.c	2011-12-08 22:17:32.000000000 +0100
> @@ -911,6 +911,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->restart_mode)
>  		reboot_setup(&mdesc->restart_mode);

Just trying to apply this patch, it won't apply to mainline because it's
based upon the bleeding edge of kernel development, rather than what's
currently in mainline.  If we're going to fix this in current mainline
and previous stable versions, the patch needs to be against that, not
linux-next.

Could you re-generate against an -rc kernel please?

  parent reply	other threads:[~2011-12-10 21:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-08 21:31 [patch 1/1] arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier Arnaud Patard (Rtp)
2011-12-08 23:46 ` Russell King - ARM Linux
2011-12-10 21:38 ` Russell King - ARM Linux [this message]
2011-12-11 19:35   ` Arnaud Patard (Rtp)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111210213836.GP14542@n2100.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).