diff options
| author | awilliam@xenbuild.aw <awilliam@xenbuild.aw> | 2006-02-18 13:17:24 -0700 |
|---|---|---|
| committer | awilliam@xenbuild.aw <awilliam@xenbuild.aw> | 2006-02-18 13:17:24 -0700 |
| commit | 8a5f45ddf8b220fa1d3e8bb5eaeb7573f6f39538 (patch) | |
| tree | f80edcecbf455d6ca21264d43d1032be3af44934 /linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | |
| parent | 06c843b557da5437df6b8d07d410143f5dfa16b9 (diff) | |
| parent | e814b1b7743c149fec0e1d5ad51fef0f43d9c86d (diff) | |
| download | xen-8a5f45ddf8b220fa1d3e8bb5eaeb7573f6f39538.tar.gz xen-8a5f45ddf8b220fa1d3e8bb5eaeb7573f6f39538.tar.bz2 xen-8a5f45ddf8b220fa1d3e8bb5eaeb7573f6f39538.zip | |
merge
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 | 9 |
1 files changed, 9 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 ea5cae05cd..a67579cdc4 100644 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c @@ -61,6 +61,9 @@ #include <asm/system.h> #include <asm/unistd.h> #include <asm/system.h> +#ifdef CONFIG_XEN +#include <asm/hypervisor.h> +#endif #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE) # error "struct cpuinfo_ia64 too big!" @@ -243,6 +246,12 @@ reserve_memory (void) rsvd_region[n].end = (unsigned long) ia64_imva(_end); n++; +#ifdef CONFIG_XEN + rsvd_region[n].start = (unsigned long) (HYPERVISOR_shared_info->arch.start_info_pfn << PAGE_SHIFT); + rsvd_region[n].end = rsvd_region[n].start + PAGE_SIZE; + n++; +#endif + #ifdef CONFIG_BLK_DEV_INITRD if (ia64_boot_param->initrd_start) { rsvd_region[n].start = (unsigned long)__va(ia64_boot_param->initrd_start); |