From 3a9cc6c3e042b57b177a2ded929cdbd82b889f60 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Wed, 2 Apr 2008 10:53:55 -0700
Subject: [PATCH] --- yaml --- r: 93169 b: refs/heads/master c:
 e04d0d0767a9c272d3c7300fb7a5221c5e3a71eb h: refs/heads/master i:   93167:
 e6e49020db0ed64783effc90b6f0dff2701ce5c6 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/xen/Makefile              | 2 +-
 trunk/arch/x86/xen/xen-ops.h             | 2 +-
 trunk/drivers/xen/Makefile               | 2 +-
 trunk/{arch/x86 => drivers}/xen/events.c | 3 +--
 trunk/include/xen/xen-ops.h              | 8 ++++++++
 6 files changed, 13 insertions(+), 6 deletions(-)
 rename trunk/{arch/x86 => drivers}/xen/events.c (99%)
 create mode 100644 trunk/include/xen/xen-ops.h

diff --git a/[refs] b/[refs]
index 64b6936ceb53..17361d7b7da9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af711cda4f94b5fddcdc5eb4134387ae026e3171
+refs/heads/master: e04d0d0767a9c272d3c7300fb7a5221c5e3a71eb
diff --git a/trunk/arch/x86/xen/Makefile b/trunk/arch/x86/xen/Makefile
index c5e9aa489900..95c59260dccb 100644
--- a/trunk/arch/x86/xen/Makefile
+++ b/trunk/arch/x86/xen/Makefile
@@ -1,4 +1,4 @@
 obj-y		:= enlighten.o setup.o multicalls.o mmu.o \
-			events.o time.o manage.o xen-asm.o
+			time.o manage.o xen-asm.o
 
 obj-$(CONFIG_SMP)	+= smp.o
diff --git a/trunk/arch/x86/xen/xen-ops.h b/trunk/arch/x86/xen/xen-ops.h
index 22395d20dd6e..f1063ae08037 100644
--- a/trunk/arch/x86/xen/xen-ops.h
+++ b/trunk/arch/x86/xen/xen-ops.h
@@ -3,6 +3,7 @@
 
 #include <linux/init.h>
 #include <linux/irqreturn.h>
+#include <xen/xen-ops.h>
 
 /* These are code, but not functions.  Defined in entry.S */
 extern const char xen_hypervisor_callback[];
@@ -10,7 +11,6 @@ extern const char xen_failsafe_callback[];
 
 void xen_copy_trap_info(struct trap_info *traps);
 
-DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);
 DECLARE_PER_CPU(unsigned long, xen_cr3);
 DECLARE_PER_CPU(unsigned long, xen_current_cr3);
 
diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile
index 609fdda90a34..823ce788b14b 100644
--- a/trunk/drivers/xen/Makefile
+++ b/trunk/drivers/xen/Makefile
@@ -1,2 +1,2 @@
-obj-y	+= grant-table.o features.o
+obj-y	+= grant-table.o features.o events.o
 obj-y	+= xenbus/
diff --git a/trunk/arch/x86/xen/events.c b/trunk/drivers/xen/events.c
similarity index 99%
rename from trunk/arch/x86/xen/events.c
rename to trunk/drivers/xen/events.c
index 85bac298b3cb..c50d499b1e6f 100644
--- a/trunk/arch/x86/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -33,12 +33,11 @@
 #include <asm/xen/hypercall.h>
 #include <asm/xen/hypervisor.h>
 
+#include <xen/xen-ops.h>
 #include <xen/events.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/event_channel.h>
 
-#include "xen-ops.h"
-
 /*
  * This lock protects updates to the following mapping and reference-count
  * arrays. The lock does not need to be acquired to read the mapping tables.
diff --git a/trunk/include/xen/xen-ops.h b/trunk/include/xen/xen-ops.h
new file mode 100644
index 000000000000..10ddfe0142d0
--- /dev/null
+++ b/trunk/include/xen/xen-ops.h
@@ -0,0 +1,8 @@
+#ifndef INCLUDE_XEN_OPS_H
+#define INCLUDE_XEN_OPS_H
+
+#include <linux/percpu.h>
+
+DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);
+
+#endif /* INCLUDE_XEN_OPS_H */