[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200803132131.10848.rjw@sisk.pl>
Date: Thu, 13 Mar 2008 21:31:09 +0100
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Pavel Machek <pavel@....cz>
Cc: ak@...e.de, kernel list <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...e.hu>, Len Brown <len.brown@...el.com>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: fix aperture vs. suspend problem
On Thursday, 13 of March 2008, Pavel Machek wrote:
>
> aperture_64.c takes a piece of memory and makes it into iommu
> window... but such window may not be saved by swsusp -- that leads to
> oops during suspend.
>
> Signed-off-by: Pavel Machek <pavel@...e.cz>
Acked-by: "Rafael J. Wysocki" <rjw@...k.pl>
> diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
> index 608152a..88747f3 100644
> --- a/arch/x86/kernel/aperture_64.c
> +++ b/arch/x86/kernel/aperture_64.c
> @@ -18,6 +18,7 @@ #include <linux/pci_ids.h>
> #include <linux/pci.h>
> #include <linux/bitops.h>
> #include <linux/ioport.h>
> +#include <linux/suspend.h>
> #include <asm/e820.h>
> #include <asm/io.h>
> #include <asm/gart.h>
> @@ -76,6 +77,7 @@ static u32 __init allocate_aperture(void
> printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n",
> aper_size >> 10, __pa(p));
> insert_aperture_resource((u32)__pa(p), aper_size);
> + register_nosave_region((u32)__pa(p) >> PAGE_SHIFT, (u32)__pa(p+aper_size) >> PAGE_SHIFT);
>
> return (u32)__pa(p);
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists