diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 19:57:42 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 19:57:42 +0100 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/x86/mm | |
| parent | x86: Use find_e820() instead of hard coded trampoline address (diff) | |
| parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| download | linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.zip | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/kmmio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 68c3e89af5c2..c0f6198565eb 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c @@ -206,7 +206,7 @@ static void disarm_kmmio_fault_page(struct kmmio_fault_page *f) */ /* * Interrupts are disabled on entry as trap3 is an interrupt gate - * and they remain disabled thorough out this function. + * and they remain disabled throughout this function. */ int kmmio_handler(struct pt_regs *regs, unsigned long addr) { @@ -302,7 +302,7 @@ no_kmmio: /* * Interrupts are disabled on entry as trap1 is an interrupt gate - * and they remain disabled thorough out this function. + * and they remain disabled throughout this function. * This must always get called as the pair to kmmio_handler(). */ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) |