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/ptrace.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/ptrace.h')
-rw-r--r-- | include/asm-arm/ptrace.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h index 604e3a1..4377e22 100644 --- a/include/asm-arm/ptrace.h +++ b/include/asm-arm/ptrace.h @@ -142,11 +142,8 @@ extern unsigned long profile_pc(struct pt_regs *regs); #endif #ifdef __KERNEL__ -extern void show_regs(struct pt_regs *); - -#define predicate(x) (x & 0xf0000000) +#define predicate(x) ((x) & 0xf0000000) #define PREDICATE_ALWAYS 0xe0000000 - #endif #endif /* __ASSEMBLY__ */ |