diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:45:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:45:21 -0400 |
| commit | f2e1fbb5f2177227f71c4fc0491e531dd7acd385 (patch) | |
| tree | c45485e3cd8a04f78184ef3bd9ce6972c74ac834 /arch/x86/xen/mmu.c | |
| parent | 508996b6a0ef0c7aa7701995d137e71c56180752 (diff) | |
| parent | 4981d01eada5354d81c8929d5b2836829ba3df7b (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Flush TLB if PGD entry is changed in i386 PAE mode
x86, dumpstack: Correct stack dump info when frame pointer is available
x86: Clean up csum-copy_64.S a bit
x86: Fix common misspellings
x86: Fix misspelling and align params
x86: Use PentiumPro-optimized partial_csum() on VIA C7
Diffstat (limited to 'arch/x86/xen/mmu.c')
| -rw-r--r-- | arch/x86/xen/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 5695fa66d565..39ee7182fd18 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -1744,7 +1744,7 @@ static void convert_pfn_mfn(void *v) | |||
| 1744 | } | 1744 | } |
| 1745 | 1745 | ||
| 1746 | /* | 1746 | /* |
| 1747 | * Set up the inital kernel pagetable. | 1747 | * Set up the initial kernel pagetable. |
| 1748 | * | 1748 | * |
| 1749 | * We can construct this by grafting the Xen provided pagetable into | 1749 | * We can construct this by grafting the Xen provided pagetable into |
| 1750 | * head_64.S's preconstructed pagetables. We copy the Xen L2's into | 1750 | * head_64.S's preconstructed pagetables. We copy the Xen L2's into |