Re: aperture_64.c: corner case wrong

[Yinghai Lu]

On Mon, May 26, 2008 at 12:17 PM, Pavel Machek <pavel@xxxxxxx> wrote:
>
> If
>
> fix == 0, aper_enabled == 1, gart_fix_e820 == 0
>
>        if (!fix && !aper_enabled)
>                return;
>
>        if (gart_fix_e820 && !fix && aper_enabled) {
>                if (e820_any_mapped(aper_base, aper_base + aper_size,
>                                    E820_RAM)) {
>                        /* reserve it, so we can reuse it in second
> kernel */
>                        printk(KERN_INFO "update e820 for GART\n");
>                        add_memory_region(aper_base, aper_size,
> E820_RESERVED);
>                        update_e820();
>                }
>                return;
>        }
>
>        /* different nodes have different setting, disable them all atfirst*/
>
> we'll fall back here and disable all the settings, even when they were
> all consistent.
>
> What about this? (I hope it compiles...)
>
> Signed-off-by: Pavel Machek <pavel@xxxxxxx>
>
>
> diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
> index 02f4dba..aa4876a 100644
> --- a/arch/x86/kernel/aperture_64.c
> +++ b/arch/x86/kernel/aperture_64.c
> @@ -344,14 +323,16 @@ out:
>        if (gart_fix_e820 && !fix && aper_enabled) {
>                if (!e820_all_mapped(aper_base, aper_base + aper_size,
>                                    E820_RESERVED)) {
>                        /* reserve it, so we can reuse it in second kernel */
>                        printk(KERN_INFO "update e820 for GART\n");
>                        add_memory_region(aper_base, aper_size, E820_RESERVED);
>                        update_e820();
>                }
> -               return;
>        }
>
> +       if (!fix)
> +               return;
> +
>        /* different nodes have different setting, disable them all at first*/
>        for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) {
>                int bus;
>
good catch.

Acked-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>

YH
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/