[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140416101243.GA6952@n2100.arm.linux.org.uk>
Date: Wed, 16 Apr 2014 11:12:43 +0100
From: Russell King - ARM Linux <linux@....linux.org.uk>
To: Sebastian Capella <sebastian.capella@...aro.org>
Cc: linux-kernel@...r.kernel.org, linux-pm@...r.kernel.org,
linaro-kernel@...ts.linaro.org,
linux-arm-kernel@...ts.infradead.org, Russ Dill <Russ.Dill@...com>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
Len Brown <len.brown@...el.com>,
Nicolas Pitre <nico@...aro.org>,
Santosh Shilimkar <santosh.shilimkar@...com>,
Will Deacon <will.deacon@....com>,
Jonathan Austin <jonathan.austin@....com>,
Catalin Marinas <catalin.marinas@....com>,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>,
Stephen Boyd <sboyd@...eaurora.org>,
Laura Abbott <lauraa@...eaurora.org>,
Jiang Liu <liuj97@...il.com>, Sricharan R <r.sricharan@...com>,
Victor Kamensky <victor.kamensky@...aro.org>,
Stefano Stabellini <stefano.stabellini@...citrix.com>,
Ben Dooks <ben.dooks@...ethink.co.uk>
Subject: Re: [PATCH v7 2/2] ARM hibernation / suspend-to-disk
On Wed, Mar 05, 2014 at 02:50:05AM -0800, Sebastian Capella wrote:
> diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
> index 8756e4b..d32adbb 100644
> --- a/arch/arm/include/asm/memory.h
> +++ b/arch/arm/include/asm/memory.h
> @@ -291,6 +291,7 @@ static inline void *phys_to_virt(phys_addr_t x)
> */
> #define __pa(x) __virt_to_phys((unsigned long)(x))
> #define __va(x) ((void *)__phys_to_virt((phys_addr_t)(x)))
> +#define __pa_symbol(x) __pa((unsigned long)(x))
> #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
I don't see the appropriate version on the mailing list, so I'll comment
here instead. In 8011/1, you added here:
+#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
which conflicts with my solution (which fixes some rather horrid assembly
code). You can find my change as e26a9e00afc4 (ARM: Better virt_to_page()
handling). I can drop this from your patch, but it would be a good idea
if you could re-validate against v3.15-rc1.
Thanks.
--
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
--
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