lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'kexec' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2011-12-16 11:09:21 +11:00
parent efdad722ef 2440c01e10
commit 43ca5d347a
6 changed files with 219 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/system.h
View File

@@ -193,8 +193,8 @@ extern void cacheable_memzero(void *p, unsigned int nb);
extern void *cacheable_memcpy(void *, const void *, unsigned int);
extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);
extern void bad_page_fault(struct pt_regs *, unsigned long, int);
extern int die(const char *, struct pt_regs *, long);
extern void _exception(int, struct pt_regs *, int, unsigned long);
extern void die(const char *, struct pt_regs *, long);
extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
#ifdef CONFIG_BOOKE_WDT