diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
| commit | dcb571be2019ae677bc5ed64437dbc87ae1eb67f (patch) | |
| tree | 1b93f9ea3568be4dcc49ffb2adc0d3ab0a02b47f /include/asm-powerpc/system.h | |
| parent | 9156ad48338e0306e508ead5c0d9986050744475 (diff) | |
| parent | 96f39c1718091d63dc1c5012d566737ea0d2a20c (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'include/asm-powerpc/system.h')
| -rw-r--r-- | include/asm-powerpc/system.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index 87be8c3bc9cb..bc9739dff5e7 100644 --- a/include/asm-powerpc/system.h +++ b/include/asm-powerpc/system.h | |||
| @@ -169,6 +169,8 @@ extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long); | |||
| 169 | extern void bad_page_fault(struct pt_regs *, unsigned long, int); | 169 | extern void bad_page_fault(struct pt_regs *, unsigned long, int); |
| 170 | extern int die(const char *, struct pt_regs *, long); | 170 | extern int die(const char *, struct pt_regs *, long); |
| 171 | extern void _exception(int, struct pt_regs *, int, unsigned long); | 171 | extern void _exception(int, struct pt_regs *, int, unsigned long); |
| 172 | extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); | ||
| 173 | |||
| 172 | #ifdef CONFIG_BOOKE_WDT | 174 | #ifdef CONFIG_BOOKE_WDT |
| 173 | extern u32 booke_wdt_enabled; | 175 | extern u32 booke_wdt_enabled; |
| 174 | extern u32 booke_wdt_period; | 176 | extern u32 booke_wdt_period; |