diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-02-13 07:26:23 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-02-13 07:26:23 -0500 |
| commit | 9b355897562fe2291248a7aec8e479c2c98cf117 (patch) | |
| tree | 89408794c55f41773b6e1b87672b2353f26dc14e /arch | |
| parent | 6a051565739f9d334ad5c15f691a9699a905897d (diff) | |
[PATCH] x86: simplify notify_page_fault()
Remove all parameters from this function that aren't really variable.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/mm/fault.c | 18 | ||||
| -rw-r--r-- | arch/x86_64/mm/fault.c | 18 |
2 files changed, 16 insertions, 20 deletions
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c index cba9b3894a33..b8c4e259fc8b 100644 --- a/arch/i386/mm/fault.c +++ b/arch/i386/mm/fault.c | |||
| @@ -46,17 +46,17 @@ int unregister_page_fault_notifier(struct notifier_block *nb) | |||
| 46 | } | 46 | } |
| 47 | EXPORT_SYMBOL_GPL(unregister_page_fault_notifier); | 47 | EXPORT_SYMBOL_GPL(unregister_page_fault_notifier); |
| 48 | 48 | ||
| 49 | static inline int notify_page_fault(enum die_val val, const char *str, | 49 | static inline int notify_page_fault(struct pt_regs *regs, long err) |
| 50 | struct pt_regs *regs, long err, int trap, int sig) | ||
| 51 | { | 50 | { |
| 52 | struct die_args args = { | 51 | struct die_args args = { |
| 53 | .regs = regs, | 52 | .regs = regs, |
| 54 | .str = str, | 53 | .str = "page fault", |
| 55 | .err = err, | 54 | .err = err, |
| 56 | .trapnr = trap, | 55 | .trapnr = 14, |
| 57 | .signr = sig | 56 | .signr = SIGSEGV |
| 58 | }; | 57 | }; |
| 59 | return atomic_notifier_call_chain(¬ify_page_fault_chain, val, &args); | 58 | return atomic_notifier_call_chain(¬ify_page_fault_chain, |
| 59 | DIE_PAGE_FAULT, &args); | ||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | /* | 62 | /* |
| @@ -327,8 +327,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 327 | if (unlikely(address >= TASK_SIZE)) { | 327 | if (unlikely(address >= TASK_SIZE)) { |
| 328 | if (!(error_code & 0x0000000d) && vmalloc_fault(address) >= 0) | 328 | if (!(error_code & 0x0000000d) && vmalloc_fault(address) >= 0) |
| 329 | return; | 329 | return; |
| 330 | if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, | 330 | if (notify_page_fault(regs, error_code) == NOTIFY_STOP) |
| 331 | SIGSEGV) == NOTIFY_STOP) | ||
| 332 | return; | 331 | return; |
| 333 | /* | 332 | /* |
| 334 | * Don't take the mm semaphore here. If we fixup a prefetch | 333 | * Don't take the mm semaphore here. If we fixup a prefetch |
| @@ -337,8 +336,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 337 | goto bad_area_nosemaphore; | 336 | goto bad_area_nosemaphore; |
| 338 | } | 337 | } |
| 339 | 338 | ||
| 340 | if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, | 339 | if (notify_page_fault(regs, error_code) == NOTIFY_STOP) |
| 341 | SIGSEGV) == NOTIFY_STOP) | ||
| 342 | return; | 340 | return; |
| 343 | 341 | ||
| 344 | /* It's safe to allow irq's after cr2 has been saved and the vmalloc | 342 | /* It's safe to allow irq's after cr2 has been saved and the vmalloc |
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index 49e8cf2e06f8..6ada7231f3ab 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c | |||
| @@ -56,17 +56,17 @@ int unregister_page_fault_notifier(struct notifier_block *nb) | |||
| 56 | } | 56 | } |
| 57 | EXPORT_SYMBOL_GPL(unregister_page_fault_notifier); | 57 | EXPORT_SYMBOL_GPL(unregister_page_fault_notifier); |
| 58 | 58 | ||
| 59 | static inline int notify_page_fault(enum die_val val, const char *str, | 59 | static inline int notify_page_fault(struct pt_regs *regs, long err) |
| 60 | struct pt_regs *regs, long err, int trap, int sig) | ||
| 61 | { | 60 | { |
| 62 | struct die_args args = { | 61 | struct die_args args = { |
| 63 | .regs = regs, | 62 | .regs = regs, |
| 64 | .str = str, | 63 | .str = "page fault", |
| 65 | .err = err, | 64 | .err = err, |
| 66 | .trapnr = trap, | 65 | .trapnr = 14, |
| 67 | .signr = sig | 66 | .signr = SIGSEGV |
| 68 | }; | 67 | }; |
| 69 | return atomic_notifier_call_chain(¬ify_page_fault_chain, val, &args); | 68 | return atomic_notifier_call_chain(¬ify_page_fault_chain, |
| 69 | DIE_PAGE_FAULT, &args); | ||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /* Sometimes the CPU reports invalid exceptions on prefetch. | 72 | /* Sometimes the CPU reports invalid exceptions on prefetch. |
| @@ -355,8 +355,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 355 | if (vmalloc_fault(address) >= 0) | 355 | if (vmalloc_fault(address) >= 0) |
| 356 | return; | 356 | return; |
| 357 | } | 357 | } |
| 358 | if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, | 358 | if (notify_page_fault(regs, error_code) == NOTIFY_STOP) |
| 359 | SIGSEGV) == NOTIFY_STOP) | ||
| 360 | return; | 359 | return; |
| 361 | /* | 360 | /* |
| 362 | * Don't take the mm semaphore here. If we fixup a prefetch | 361 | * Don't take the mm semaphore here. If we fixup a prefetch |
| @@ -365,8 +364,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 365 | goto bad_area_nosemaphore; | 364 | goto bad_area_nosemaphore; |
| 366 | } | 365 | } |
| 367 | 366 | ||
| 368 | if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, | 367 | if (notify_page_fault(regs, error_code) == NOTIFY_STOP) |
| 369 | SIGSEGV) == NOTIFY_STOP) | ||
| 370 | return; | 368 | return; |
| 371 | 369 | ||
| 372 | if (likely(regs->eflags & X86_EFLAGS_IF)) | 370 | if (likely(regs->eflags & X86_EFLAGS_IF)) |