diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-03-25 11:44:14 +0100 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:24:27 -0500 |
| commit | d26547481e092c5787d28a2a0f635917ad8be14a (patch) | |
| tree | 9ec980fc8110dd014ed06e74b15710c8f00785f0 /arch/arm/kernel/return_address.c | |
| parent | d4dcb6cf615bddf7b864ea5746bddb2a4d2cbd6f (diff) | |
ARM: 8328/1: remove empty preprocessor #else branch
When the patch for e16343c47e42 (ARM: 8160/1: drop warning about
return_address not using unwind tables) was created there was still more
code in said branch. Probably this simplification was just missed during
conflict resolution when the patch was applied.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/return_address.c')
| -rw-r--r-- | arch/arm/kernel/return_address.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c index 98ea4b7eb406..2bd192668aa5 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -57,8 +57,6 @@ void *return_address(unsigned int level) return NULL; } -#else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ - -#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ +#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ EXPORT_SYMBOL_GPL(return_address); |