diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 22:17:37 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 22:17:37 -0500 |
| commit | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (patch) | |
| tree | eb80eebf368957df18c2a4c0ee02897e0a9b06d2 /include/asm-s390/kdebug.h | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'include/asm-s390/kdebug.h')
| -rw-r--r-- | include/asm-s390/kdebug.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-s390/kdebug.h b/include/asm-s390/kdebug.h index 40cc68025e01..1b50f89819a4 100644 --- a/include/asm-s390/kdebug.h +++ b/include/asm-s390/kdebug.h | |||
| @@ -26,7 +26,6 @@ extern int register_page_fault_notifier(struct notifier_block *); | |||
| 26 | extern int unregister_page_fault_notifier(struct notifier_block *); | 26 | extern int unregister_page_fault_notifier(struct notifier_block *); |
| 27 | extern struct atomic_notifier_head s390die_chain; | 27 | extern struct atomic_notifier_head s390die_chain; |
| 28 | 28 | ||
| 29 | |||
| 30 | enum die_val { | 29 | enum die_val { |
| 31 | DIE_OOPS = 1, | 30 | DIE_OOPS = 1, |
| 32 | DIE_BPT, | 31 | DIE_BPT, |
| @@ -56,4 +55,6 @@ static inline int notify_die(enum die_val val, const char *str, | |||
| 56 | return atomic_notifier_call_chain(&s390die_chain, val, &args); | 55 | return atomic_notifier_call_chain(&s390die_chain, val, &args); |
| 57 | } | 56 | } |
| 58 | 57 | ||
| 58 | extern void die(const char *, struct pt_regs *, long); | ||
| 59 | |||
| 59 | #endif | 60 | #endif |