[PATCH] xen: compilation fix for ia64 support.

[PATCH] xen: compilation fix for ia64 support.

[Isaku Yamahata]

don't include asm/pvclock-abi.h directly, but asm/xen/pvclock-abi.h
At this moment linux ia64 won't accept asm/pvclock-abi.h because
there's no user of it. Instead make it include asm/xen/pvclock-abi.h
and create asm-x86/xen/pvclock-abi.h which includes asm-x86/pvclock-abi.h.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 include/asm-x86/xen/pvclock-abi.h |    6 ++++++
 include/xen/interface/xen.h       |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
 create mode 100644 include/asm-x86/xen/pvclock-abi.h

diff --git a/include/asm-x86/xen/pvclock-abi.h b/include/asm-x86/xen/pvclock-abi.h
new file mode 100644
index 0000000..a4476db
--- /dev/null
+++ b/include/asm-x86/xen/pvclock-abi.h
@@ -0,0 +1,6 @@
+#ifndef __XEN_PVCLOCK_ABI_H
+#define __XEN_PVCLOCK_ABI_H
+
+#include <asm-x86/pvclock-abi.h>
+
+#endif /* __XEN_PVCLOCK_ABI_H */
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 2befa3e..c36888b 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -10,7 +10,7 @@
 #define __XEN_PUBLIC_XEN_H__
 
 #include <asm/xen/interface.h>
-#include <asm/pvclock-abi.h>
+#include <asm/xen/pvclock-abi.h>
 
 /*
  * XEN "SYSTEM CALLS" (a.k.a. HYPERCALLS).
-- 
1.5.3

Re: [PATCH] xen: compilation fix for ia64 support.

[Jeremy Fitzhardinge]

Isaku Yamahata wrote:
> don't include asm/pvclock-abi.h directly, but asm/xen/pvclock-abi.h
> At this moment linux ia64 won't accept asm/pvclock-abi.h because
> there's no user of it.

Huh?  Is this a ia64 maintainer policy?  Aren't you about to start using it?

>  Instead make it include asm/xen/pvclock-abi.h
> and create asm-x86/xen/pvclock-abi.h which includes asm-x86/pvclock-abi.h.
>   

I'm not very keen on crufting up asm-x86/xen/ for the ia64 code.  
Couldn't you have an asm-ia64/xen/pvclock-abi.h which includes 
<asm-x86/pvclock-abi.h>?

    J

Re: [PATCH] xen: compilation fix for ia64 support.

[Isaku Yamahata]

On Thu, Jul 03, 2008 at 02:51:03PM -0700, Jeremy Fitzhardinge wrote:
> Isaku Yamahata wrote:
> >don't include asm/pvclock-abi.h directly, but asm/xen/pvclock-abi.h
> >At this moment linux ia64 won't accept asm/pvclock-abi.h because
> >there's no user of it.
> 
> Huh?  Is this a ia64 maintainer policy?  Aren't you about to start using it?

Ah sorry, that was only what I expected. I haven't asked the maintainer yet.
I'm asking now.


> > Instead make it include asm/xen/pvclock-abi.h
> >and create asm-x86/xen/pvclock-abi.h which includes asm-x86/pvclock-abi.h.
> >  
> 
> I'm not very keen on crufting up asm-x86/xen/ for the ia64 code.  
> Couldn't you have an asm-ia64/xen/pvclock-abi.h which includes 
> <asm-x86/pvclock-abi.h>?

I'm file with that. In fact I don't have strong opinion here
as long as the linux ia64 maintainer, Tony, is fine.

Tony, what do you think about the following patch?
- path
  asm-ia64/pvclock-abi.h versus asm-ia64/xen/pvclock-abi.h
- including asm-x86/pvclock-abi.h

From fa958c98713f193eeab2cbe9bab1676059b850a3 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Fri, 4 Jul 2008 11:29:33 +0900
Subject: [PATCH] ia64/xen: add a neccessary header file to copmle include/xen/interface/xen.h

Create include/asm-ia64/pvclock-abi.h to compile which includes
include/asm-x86/pvclock-abi.h because ia64/xen uses same struture.
Hopefully include/asm-x86/pvclock-abi.h would be moved to somewhere
more generic.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 include/asm-ia64/pvclock-abi.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 include/asm-ia64/pvclock-abi.h

diff --git a/include/asm-ia64/pvclock-abi.h b/include/asm-ia64/pvclock-abi.h
new file mode 100644
index 0000000..1c34d11
--- /dev/null
+++ b/include/asm-ia64/pvclock-abi.h
@@ -0,0 +1,5 @@
+/*
+ * use same streucute to x86's
+ * Hopefully asm-x86/pvclock-abi.h would be moved to somewhere more generic.
+ */
+#include <asm-x86/pvclock-abi.h>
-- 
1.5.3


-- 
yamahata