From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com,
Stefano.Stabellini@eu.citrix.com, will.deacon@arm.com,
catalin.marinas@arm.com, Ian.Campbell@citrix.com,
konrad.wilk@oracle.com,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH v4 1/6] arm/xen: define xen_remap as ioremap_cached
Date: Wed, 5 Jun 2013 18:02:02 +0100 [thread overview]
Message-ID: <1370451727-26826-1-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1306051605030.4589@kaball.uk.xensource.com>
Define xen_remap as ioremap_cache (MT_MEMORY and MT_DEVICE_CACHED end up
having the same AttrIndx encoding).
Remove include asm/mach/map.h, not unneeded.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/arm/include/asm/xen/page.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h
index 30cdacb..359a7b5 100644
--- a/arch/arm/include/asm/xen/page.h
+++ b/arch/arm/include/asm/xen/page.h
@@ -1,7 +1,6 @@
#ifndef _ASM_ARM_XEN_PAGE_H
#define _ASM_ARM_XEN_PAGE_H
-#include <asm/mach/map.h>
#include <asm/page.h>
#include <asm/pgtable.h>
@@ -88,6 +87,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn)
return __set_phys_to_machine(pfn, mfn);
}
-#define xen_remap(cookie, size) __arm_ioremap((cookie), (size), MT_MEMORY);
+#define xen_remap(cookie, size) ioremap_cached((cookie), (size));
#endif /* _ASM_ARM_XEN_PAGE_H */
--
1.7.2.5
next prev parent reply other threads:[~2013-06-05 17:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-05 16:59 [PATCH v4 0/6] Introduce Xen support to ARM64 Stefano Stabellini
2013-06-05 17:02 ` Stefano Stabellini [this message]
2013-06-05 17:02 ` [PATCH v4 2/6] arm64/xen: introduce asm/xen header files on arm64 Stefano Stabellini
2013-06-05 17:02 ` [PATCH v4 3/6] arm64/xen: implement ioremap_cached " Stefano Stabellini
2013-06-05 17:02 ` [PATCH v4 4/6] arm64/xen: use XEN_IO_PROTO_ABI_ARM on ARM64 Stefano Stabellini
2013-06-05 17:02 ` [PATCH v4 5/6] arm64/xen: introduce CONFIG_XEN " Stefano Stabellini
2013-06-06 9:03 ` [Xen-devel] " Ian Campbell
2013-06-06 9:27 ` Catalin Marinas
2013-06-06 9:29 ` Ian Campbell
2013-06-06 14:25 ` Catalin Marinas
2013-06-05 17:02 ` [PATCH v4 6/6] MAINTAINERS: add myself as arm64/xen maintainer Stefano Stabellini
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=1370451727-26826-1-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=catalin.marinas@arm.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=will.deacon@arm.com \
--cc=xen-devel@lists.xensource.com \
/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).