diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-07-17 10:53:37 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-07-17 10:53:37 -0700 |
| commit | fca515fbfa5ecd9f7b54db311317e2c877d7831a (patch) | |
| tree | 66b44028b3ab5be068be78650932812520d78865 /arch/ia64/kernel/setup.c | |
| parent | 2b04be7e8ab5756ea36e137dd03c8773d184e67e (diff) | |
| parent | 4d58bbcc89e267d52b4df572acbf209a60a8a497 (diff) | |
| download | linux-fca515fbfa5ecd9f7b54db311317e2c877d7831a.tar.gz linux-fca515fbfa5ecd9f7b54db311317e2c877d7831a.tar.bz2 linux-fca515fbfa5ecd9f7b54db311317e2c877d7831a.zip | |
Pull pvops into release branch
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 632cda8f2e76..e5c2de9b29a5 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -51,6 +51,7 @@ #include <asm/mca.h> #include <asm/meminit.h> #include <asm/page.h> +#include <asm/paravirt.h> #include <asm/patch.h> #include <asm/pgtable.h> #include <asm/processor.h> @@ -341,6 +342,8 @@ reserve_memory (void) rsvd_region[n].end = (unsigned long) ia64_imva(_end); n++; + n += paravirt_reserve_memory(&rsvd_region[n]); + #ifdef CONFIG_BLK_DEV_INITRD if (ia64_boot_param->initrd_start) { rsvd_region[n].start = (unsigned long)__va(ia64_boot_param->initrd_start); @@ -519,6 +522,8 @@ setup_arch (char **cmdline_p) { unw_init(); + paravirt_arch_setup_early(); + ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist); *cmdline_p = __va(ia64_boot_param->command_line); @@ -583,6 +588,9 @@ setup_arch (char **cmdline_p) acpi_boot_init(); #endif + paravirt_banner(); + paravirt_arch_setup_console(cmdline_p); + #ifdef CONFIG_VT if (!conswitchp) { # if defined(CONFIG_DUMMY_CONSOLE) @@ -602,6 +610,8 @@ setup_arch (char **cmdline_p) #endif /* enable IA-64 Machine Check Abort Handling unless disabled */ + if (paravirt_arch_setup_nomca()) + nomca = 1; if (!nomca) ia64_mca_init(); |