aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-26 19:51:23 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-26 19:51:23 -0400
commitf436ab43614f105a4685c976a85a171bc112c802 (patch)
tree21db536f54a642c627008c664e2679c0ff3ccbc3 /include
parent6cd236e0057704d1f5c77908374079e021c83928 (diff)
parent0c07f6115b779ae4597749d47dec228c6d2d1c7c (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4449/1: more entries in arch/arm/boot/.gitignore [ARM] 4452/1: Force the literal pool dump before reloc_end [ARM] Update show_regs/oops register format [ARM] Add support for pause_on_oops and display preempt/smp options
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/ptrace.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index 2d0dad8c10ac..ee3d93c281d8 100644
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -112,9 +112,6 @@ struct pt_regs {
112#define fast_interrupts_enabled(regs) \ 112#define fast_interrupts_enabled(regs) \
113 (!((regs)->ARM_cpsr & PSR_F_BIT)) 113 (!((regs)->ARM_cpsr & PSR_F_BIT))
114 114
115#define condition_codes(regs) \
116 ((regs)->ARM_cpsr & (PSR_V_BIT|PSR_C_BIT|PSR_Z_BIT|PSR_N_BIT))
117
118/* Are the current registers suitable for user mode? 115/* Are the current registers suitable for user mode?
119 * (used to maintain security in signal handlers) 116 * (used to maintain security in signal handlers)
120 */ 117 */