diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /arch/x86/kernel/paravirt.c | |
| parent | 510b37258dfd61693ca6c039865c78bd996e3718 (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/paravirt.c')
| -rw-r--r-- | arch/x86/kernel/paravirt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 00c53a049756..5744789a78f4 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
| @@ -441,7 +441,7 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
| 441 | #endif /* PAGETABLE_LEVELS >= 3 */ | 441 | #endif /* PAGETABLE_LEVELS >= 3 */ |
| 442 | 442 | ||
| 443 | .pte_val = native_pte_val, | 443 | .pte_val = native_pte_val, |
| 444 | .pte_flags = native_pte_val, | 444 | .pte_flags = native_pte_flags, |
| 445 | .pgd_val = native_pgd_val, | 445 | .pgd_val = native_pgd_val, |
| 446 | 446 | ||
| 447 | .make_pte = native_make_pte, | 447 | .make_pte = native_make_pte, |