diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 21:47:24 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 21:47:24 (GMT) |
commit | a4e884a311893b476893739901bed382cd62b4fe (patch) | |
tree | 7b7b52678b61dfdf8e3a16b0e920d1e9b0cae979 /include/asm-arm/system.h | |
parent | ce1dc02f76432a46db149241e015a4f782974623 (diff) | |
parent | cc56449f53ba45646c6f0a2edf77c4acb342caed (diff) | |
download | linux-fsl-qoriq-a4e884a311893b476893739901bed382cd62b4fe.tar.xz |
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
First ever true git merge. Let's see if it actually works.
Diffstat (limited to 'include/asm-arm/system.h')
-rw-r--r-- | include/asm-arm/system.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index b573129..b13a8da 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -99,6 +99,9 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, #define tas(ptr) (xchg((ptr),1)) extern asmlinkage void __backtrace(void); +extern asmlinkage void c_backtrace(unsigned long fp, int pmode); +extern void show_pte(struct mm_struct *mm, unsigned long addr); +extern void __show_regs(struct pt_regs *); extern int cpu_architecture(void); |