diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-03-25 11:44:14 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-03-28 16:54:53 +0000 |
| commit | 15955e70320bdc5d60b153a572ee4d89ab34e3d3 (patch) | |
| tree | 8c6bc3e50e3917e87db327724997627719aee9d2 | |
| parent | c20611df13c3e3070607c267cf781ba8645a185e (diff) | |
| download | linux-15955e70320bdc5d60b153a572ee4d89ab34e3d3.tar.bz2 | |
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>
| -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 24b4a04846eb..36ed35073289 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -56,8 +56,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); |