diff options
author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 17:25:08 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-03-31 17:25:08 -0400 |
commit | c66b31f3926165bc1d4128adc97a064dcbab421a (patch) | |
tree | 13be75d33bd2b9d4ec45ec512ac38a2e7069062e /arch/ia64/kernel/setup.c | |
parent | 50fbe56c127efde659c686495eb1f925fd84ff0a (diff) | |
parent | 7120569c76028a6883697b7643564f0c419cfe07 (diff) |
Pull pvops into release branch
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index ae9ec3dc76b8..833b3ef92779 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -52,6 +52,7 @@ | |||
52 | #include <asm/meminit.h> | 52 | #include <asm/meminit.h> |
53 | #include <asm/page.h> | 53 | #include <asm/page.h> |
54 | #include <asm/paravirt.h> | 54 | #include <asm/paravirt.h> |
55 | #include <asm/paravirt_patch.h> | ||
55 | #include <asm/patch.h> | 56 | #include <asm/patch.h> |
56 | #include <asm/pgtable.h> | 57 | #include <asm/pgtable.h> |
57 | #include <asm/processor.h> | 58 | #include <asm/processor.h> |
@@ -537,6 +538,7 @@ setup_arch (char **cmdline_p) | |||
537 | paravirt_arch_setup_early(); | 538 | paravirt_arch_setup_early(); |
538 | 539 | ||
539 | ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist); | 540 | ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist); |
541 | paravirt_patch_apply(); | ||
540 | 542 | ||
541 | *cmdline_p = __va(ia64_boot_param->command_line); | 543 | *cmdline_p = __va(ia64_boot_param->command_line); |
542 | strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE); | 544 | strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE); |