mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chen Baozi <baozich@gmail.com>
To: linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org
Cc: catalin.marinas@arm.com, stefano.stabellini@eu.citrix.com,
	linux-kernel@vger.kernel.org, msalter@redhat.com,
	Chen Baozi <baozich@gmail.com>
Subject: [PATCH] arm64/xen: redefine xen_remap on arm64
Date: Mon, 30 Dec 2013 14:55:11 +0800	[thread overview]
Message-ID: <1388386511-32276-1-git-send-email-baozich@gmail.com> (raw)

xen_remap used to be defined as ioremap_cached on arm64. In commit
c04e8e2fe, a new ioremap_cache was implemented, and ioremap_cached
was deleted, while xen_remap stays the same. This would lead to
the failure when building with CONFIG_HVC_XEN. Redefined xen_remap
on arm64 as ioremap_cache on arm64 to fix it.

Signed-off-by: Chen Baozi <baozich@gmail.com>
---
 arch/arm/include/asm/xen/page.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h
index 75579a9..b3368df 100644
--- a/arch/arm/include/asm/xen/page.h
+++ b/arch/arm/include/asm/xen/page.h
@@ -117,6 +117,10 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn)
 	return __set_phys_to_machine(pfn, mfn);
 }
 
+#ifdef CONFIG_ARM64
+#define xen_remap(cookie, size) ioremap_cache((cookie), (size))
+#else
 #define xen_remap(cookie, size) ioremap_cached((cookie), (size));
+#endif
 
 #endif /* _ASM_ARM_XEN_PAGE_H */
-- 
1.8.4.3


             reply	other threads:[~2013-12-30  8:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-30  6:55 Chen Baozi [this message]
2013-12-30  9:43 ` [Xen-devel] " Wei Liu
2014-01-03 13:19   ` Stefano Stabellini
2013-12-30 19:20 ` Mark Salter
2014-01-03 13:13   ` Stefano Stabellini
2014-01-03 13:32     ` Stefano Stabellini
2014-01-03 14:31     ` Russell King - ARM Linux
2014-01-03 14:49       ` Stefano Stabellini
2014-01-03 14:59         ` Russell King - ARM Linux
2014-01-03 15:17           ` 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=1388386511-32276-1-git-send-email-baozich@gmail.com \
    --to=baozich@gmail.com \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=msalter@redhat.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.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

all inboxes | Powered by JetHome®