diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/x86/mm | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
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) | |||
| 206 | */ | 206 | */ |
| 207 | /* | 207 | /* |
| 208 | * Interrupts are disabled on entry as trap3 is an interrupt gate | 208 | * Interrupts are disabled on entry as trap3 is an interrupt gate |
| 209 | * and they remain disabled thorough out this function. | 209 | * and they remain disabled throughout this function. |
| 210 | */ | 210 | */ |
| 211 | int kmmio_handler(struct pt_regs *regs, unsigned long addr) | 211 | int kmmio_handler(struct pt_regs *regs, unsigned long addr) |
| 212 | { | 212 | { |
| @@ -302,7 +302,7 @@ no_kmmio: | |||
| 302 | 302 | ||
| 303 | /* | 303 | /* |
| 304 | * Interrupts are disabled on entry as trap1 is an interrupt gate | 304 | * Interrupts are disabled on entry as trap1 is an interrupt gate |
| 305 | * and they remain disabled thorough out this function. | 305 | * and they remain disabled throughout this function. |
| 306 | * This must always get called as the pair to kmmio_handler(). | 306 | * This must always get called as the pair to kmmio_handler(). |
| 307 | */ | 307 | */ |
| 308 | static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) | 308 | static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) |