diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:24:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:25:03 -0400 |
| commit | bfefb7a0c6e08736f2d5917c468467f134bf28bb (patch) | |
| tree | 7aa7084114dc083fe5b4d7b532901bdeb67188e7 /arch/x86/xen/mmu.h | |
| parent | 8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Bring in changes that the next patch will depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen/mmu.h')
| -rw-r--r-- | arch/x86/xen/mmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index da7302624897..5fe6bc7f5ecf 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h | |||
| @@ -59,5 +59,5 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, | |||
| 59 | 59 | ||
| 60 | unsigned long xen_read_cr2_direct(void); | 60 | unsigned long xen_read_cr2_direct(void); |
| 61 | 61 | ||
| 62 | extern const struct pv_mmu_ops xen_mmu_ops; | 62 | extern void xen_init_mmu_ops(void); |
| 63 | #endif /* _XEN_MMU_H */ | 63 | #endif /* _XEN_MMU_H */ |