summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/dumpstack.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2016-10-17 13:07:46 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-10-17 14:44:33 +0200
commitdcddba96cdbc5d0e4d4a17bf22cfd9b2f038a4ca (patch)
tree409b7d1c784ecb598a9da816f60aee9e7761cab5 /arch/s390/kernel/dumpstack.c
parent4d062487f3431f124e3a2420c0da0b7a2388dc80 (diff)
downloadlinux-stable-dcddba96cdbc5d0e4d4a17bf22cfd9b2f038a4ca.tar.gz
linux-stable-dcddba96cdbc5d0e4d4a17bf22cfd9b2f038a4ca.tar.bz2
linux-stable-dcddba96cdbc5d0e4d4a17bf22cfd9b2f038a4ca.zip
s390/dumpstack: get rid of return_address again
With commit ef6000b4c670 ("Disable the __builtin_return_address() warning globally after all)" the kernel does not warn at all again if __builtin_return_address(n) is called with n > 0. Besides the fact that this was a false warning on s390 anyway, due to the always present backchain, we can now revert commit 5606330627ab ("s390/dumpstack: implement and use return_address()") again, to simplify the code again. After all I shouldn't have had return_address() implememted at all to workaround this issue. So get rid of this again. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/dumpstack.c')
-rw-r--r--arch/s390/kernel/dumpstack.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c
index 4bebe72b7780..34345c0a3c46 100644
--- a/arch/s390/kernel/dumpstack.c
+++ b/arch/s390/kernel/dumpstack.c
@@ -87,30 +87,6 @@ void dump_trace(dump_trace_func_t func, void *data, struct task_struct *task,
}
EXPORT_SYMBOL_GPL(dump_trace);
-struct return_address_data {
- unsigned long address;
- int depth;
-};
-
-static int __return_address(void *data, unsigned long address, int reliable)
-{
- struct return_address_data *rd = data;
-
- if (rd->depth--)
- return 0;
- rd->address = address;
- return 1;
-}
-
-unsigned long return_address(int depth)
-{
- struct return_address_data rd = { .depth = depth + 2 };
-
- dump_trace(__return_address, &rd, NULL, current_stack_pointer());
- return rd.address;
-}
-EXPORT_SYMBOL_GPL(return_address);
-
static int show_address(void *data, unsigned long address, int reliable)
{
if (reliable)