diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-28 12:44:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-04-03 17:50:12 +0200 |
| commit | 651e94995ed5c10d77adcf19edb9de7d6f0cac3e (patch) | |
| tree | 723b79cbaaa99af34e9021b9216e46d58f733698 /arch/arm/kernel | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-651e94995ed5c10d77adcf19edb9de7d6f0cac3e.tar.xz linux-651e94995ed5c10d77adcf19edb9de7d6f0cac3e.zip | |
ARM: entry-common: get rid of unnecessary ifdefs
The contents of the asm_trace_hardirqs_on is already conditional on
CONFIG_TRACE_IRQFLAGS. There's little point also making the use
of the macro conditional as well. Get rid of these ifdefs to make
the code easier to read.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 3248cde504ed..6f37ddfadbfa 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -35,9 +35,7 @@ ret_fast_syscall: ldr r1, [tsk, #TI_FLAGS] tst r1, #_TIF_WORK_MASK bne fast_work_pending -#if defined(CONFIG_IRQSOFF_TRACER) asm_trace_hardirqs_on -#endif /* perform architecture specific actions before user return */ arch_ret_to_user r1, lr @@ -71,9 +69,8 @@ ENTRY(ret_to_user_from_irq) tst r1, #_TIF_WORK_MASK bne work_pending no_work_pending: -#if defined(CONFIG_IRQSOFF_TRACER) asm_trace_hardirqs_on -#endif + /* perform architecture specific actions before user return */ arch_ret_to_user r1, lr |