summaryrefslogtreecommitdiffstats
path: root/include/xen/page.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2010-12-17 13:29:07 -0500
committerJ. Bruce Fields <bfields@redhat.com>2010-12-17 13:29:07 -0500
commitec66ee3797e5848356cf593c6ec7aabf30a00cf1 (patch)
tree7ed5c84cc914644ffa1cd1b6a2b45db53fc224e8 /include/xen/page.h
parent1205065764f2eda3216ebe213143f69891ee3460 (diff)
parentb0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff)
downloadblackbird-op-linux-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.tar.gz
blackbird-op-linux-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.zip
Merge commit 'v2.6.37-rc6' into for-2.6.38
Diffstat (limited to 'include/xen/page.h')
-rw-r--r--include/xen/page.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/xen/page.h b/include/xen/page.h
index eaf85fab1263..0be36b976f4b 100644
--- a/include/xen/page.h
+++ b/include/xen/page.h
@@ -1 +1,8 @@
+#ifndef _XEN_PAGE_H
+#define _XEN_PAGE_H
+
#include <asm/xen/page.h>
+
+extern phys_addr_t xen_extra_mem_start, xen_extra_mem_size;
+
+#endif /* _XEN_PAGE_H */
OpenPOWER on IntegriCloud