Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e04d0d07 authored by Isaku Yamahata's avatar Isaku Yamahata Committed by Ingo Molnar
Browse files

xen: move events.c to drivers/xen for IA64/Xen support 



move arch/x86/xen/events.c undedr drivers/xen to share codes
with x86 and ia64. And minor adjustment to compile.
ia64/xen also uses events.c

Signed-off-by: default avatarYaozu (Eddie) Dong <eddie.dong@intel.com>
Signed-off-by: default avatarIsaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent af711cda

arch/x86/xen/Makefile

+1 −1
Original line number Diff line number Diff line 
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

arch/x86/xen/xen-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/xen/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y	+= grant-table.o features.o

obj-y	+= grant-table.o features.o events.o

obj-y	+= xenbus/

arch/x86/xen/events.c→drivers/xen/events.c

+1 −2
Original line number Diff line number Diff line
@@ -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.

include/xen/xen-ops.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#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 */