summaryrefslogtreecommitdiff
path: root/xen/xen.h
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-08-11 13:47:29 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-08-11 13:47:29 +0200
commitbfdb3be16e5a20eebc97b3ca613d9a4da4465533 (patch)
treec353e3ad19017c8f5cdb330d6363ca2845cb11c4 /xen/xen.h
parentec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (diff)
parente1f856119dae48fcc1b649521ca45e4bdaa80ea9 (diff)
Merge branch 'master' into master-gdb_stubs
Conflicts: i386/i386at/com.c
Diffstat (limited to 'xen/xen.h')
-rw-r--r--xen/xen.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/xen/xen.h b/xen/xen.h
index 87e1256c..6eeb350e 100644
--- a/xen/xen.h
+++ b/xen/xen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Samuel Thibault <samuel.thibault@ens-lyon.org>
+ * Copyright (C) 2006-2010, 2011 Samuel Thibault <samuel.thibault@ens-lyon.org>
*
* This program is free software ; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
#define XEN_XEN_H
void hyp_init(void);
+void hyp_dev_init(void);
void hyp_invalidate_pte(pt_entry_t *pte);
void hyp_idle(void);
void hyp_p2m_init(void);