diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
|---|---|---|
| committer | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
| commit | ab26a6a563a0acb589af87a8e063c0e171d75665 (patch) | |
| tree | 71a432bde5d016e928ab3ad7860fca01312ec787 /linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | |
| parent | d3be8a6ca1aa9312cc01e780a2fea56ab8ec12b4 (diff) | |
| parent | 1c804664cf63f0c2e80d0420e52d5f82c3956685 (diff) | |
| download | xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.gz xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.bz2 xen-ab26a6a563a0acb589af87a8e063c0e171d75665.zip | |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Diffstat (limited to 'linux-2.6-xen-sparse/arch/ia64/kernel/setup.c')
| -rw-r--r-- | linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c index f792900cf9..8f15b3001c 100644 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c @@ -63,6 +63,7 @@ #include <asm/system.h> #ifdef CONFIG_XEN #include <asm/hypervisor.h> +#include <asm/xen/xencomm.h> #endif #include <linux/dma-mapping.h> @@ -433,6 +434,9 @@ setup_arch (char **cmdline_p) #ifdef CONFIG_XEN if (is_running_on_xen()) { + /* Must be done before any hypercall. */ + xencomm_init(); + setup_xen_features(); /* Register a call for panic conditions. */ notifier_chain_register(&panic_notifier_list, &xen_panic_block); |