diff options
| author | Linus Torvalds | 2007-10-17 20:10:11 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-17 20:10:11 +0200 |
| commit | fb9fc395174138983a49f2da982ed14caabbe741 (patch) | |
| tree | 5d5d3643ee6853a899205613da272cc343fdc1a4 /arch/x86/kernel/alternative.c | |
| parent | [MIPS] IP22: Fix hang due to messing with timer interrupt handler (diff) | |
| parent | xfs: eagerly remove vmap mappings to avoid upsetting Xen (diff) | |
| download | kernel-qcow2-linux-fb9fc395174138983a49f2da982ed14caabbe741.tar.gz kernel-qcow2-linux-fb9fc395174138983a49f2da982ed14caabbe741.tar.xz kernel-qcow2-linux-fb9fc395174138983a49f2da982ed14caabbe741.zip | |
Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xfs: eagerly remove vmap mappings to avoid upsetting Xen
xen: add some debug output for failed multicalls
xen: fix incorrect vcpu_register_vcpu_info hypercall argument
xen: ask the hypervisor how much space it needs reserved
xen: lock pte pages while pinning/unpinning
xen: deal with stale cr3 values when unpinning pagetables
xen: add batch completion callbacks
xen: yield to IPI target if necessary
Clean up duplicate includes in arch/i386/xen/
remove dead code in pgtable_cache_init
paravirt: clean up lazy mode handling
paravirt: refactor struct paravirt_ops into smaller pv_*_ops
Diffstat (limited to 'arch/x86/kernel/alternative.c')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 11b03d3c6fda..42421437ded3 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -369,8 +369,8 @@ void apply_paravirt(struct paravirt_patch_site *start, BUG_ON(p->len > MAX_PATCH_LEN); /* prep the buffer with the original instructions */ memcpy(insnbuf, p->instr, p->len); - used = paravirt_ops.patch(p->instrtype, p->clobbers, insnbuf, - (unsigned long)p->instr, p->len); + used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, + (unsigned long)p->instr, p->len); BUG_ON(used > p->len); |