lkml.org 
[lkml]   [2013]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH RFC 2/6] arm64/xen: arm/xen header changes to compile on arm64
Date
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/arm/include/asm/xen/events.h | 4 ++++
arch/arm/include/asm/xen/page.h | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/xen/events.h b/arch/arm/include/asm/xen/events.h
index 8b1f37b..12e4e0b 100644
--- a/arch/arm/include/asm/xen/events.h
+++ b/arch/arm/include/asm/xen/events.h
@@ -13,7 +13,11 @@ enum ipi_vector {

static inline int xen_irqs_disabled(struct pt_regs *regs)
{
+#ifdef CONFIG_ARM
return raw_irqs_disabled_flags(regs->ARM_cpsr);
+#else
+ return raw_irqs_disabled_flags((unsigned long) regs->pstate);
+#endif
}

#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((ptr), \
diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h
index 30cdacb..cb2fa15 100644
--- a/arch/arm/include/asm/xen/page.h
+++ b/arch/arm/include/asm/xen/page.h
@@ -1,7 +1,9 @@
#ifndef _ASM_ARM_XEN_PAGE_H
#define _ASM_ARM_XEN_PAGE_H

+#ifdef ARM
#include <asm/mach/map.h>
+#endif
#include <asm/page.h>
#include <asm/pgtable.h>

--
1.7.2.5


\
 
 \ /
  Last update: 2013-05-30 20:41    [W:0.108 / U:0.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site