git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
asm-i386
/
mach-xen
/
asm
/
hypervisor.h
diff --git
a/include/asm-i386/mach-xen/asm/hypervisor.h
b/include/asm-i386/mach-xen/asm/hypervisor.h
index
3837855
..
2e22141
100644
(file)
--- a/
include/asm-i386/mach-xen/asm/hypervisor.h
+++ b/
include/asm-i386/mach-xen/asm/hypervisor.h
@@
-33,7
+33,6
@@
#ifndef __HYPERVISOR_H__
#define __HYPERVISOR_H__
#ifndef __HYPERVISOR_H__
#define __HYPERVISOR_H__
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/version.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/version.h>
@@
-58,6
+57,11
@@
extern shared_info_t *HYPERVISOR_shared_info;
/* arch/xen/i386/kernel/setup.c */
extern start_info_t *xen_start_info;
/* arch/xen/i386/kernel/setup.c */
extern start_info_t *xen_start_info;
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+#define is_initial_xendomain() (xen_start_info->flags & SIF_INITDOMAIN)
+#else
+#define is_initial_xendomain() 0
+#endif
/* arch/xen/kernel/evtchn.c */
/* Force a proper event-channel callback from Xen. */
/* arch/xen/kernel/evtchn.c */
/* Force a proper event-channel callback from Xen. */
@@
-197,6
+201,16
@@
MULTI_update_va_mapping(
mcl->args[MULTI_UVMFLAGS_INDEX] = flags;
}
mcl->args[MULTI_UVMFLAGS_INDEX] = flags;
}
+static inline void
+MULTI_grant_table_op(multicall_entry_t *mcl, unsigned int cmd,
+ void *uop, unsigned int count)
+{
+ mcl->op = __HYPERVISOR_grant_table_op;
+ mcl->args[0] = cmd;
+ mcl->args[1] = (unsigned long)uop;
+ mcl->args[2] = count;
+}
+
static inline void
MULTI_update_va_mapping_otherdomain(
multicall_entry_t *mcl, unsigned long va,
static inline void
MULTI_update_va_mapping_otherdomain(
multicall_entry_t *mcl, unsigned long va,