diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-24 05:09:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-24 05:09:08 +0100 |
| commit | 69e6cdd0cf16f645be39038e5ccc9379e3923d00 (patch) | |
| tree | 3edb32b07ef37be1536f6510ec8e7caaf5acbbb8 /arch/s390/kernel/stacktrace.c | |
| parent | Merge tag 'perf-core-for-mingo-20161114' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | Merge tag 'nfs-for-4.9-4' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
| download | linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.tar.xz linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/stacktrace.c')
| -rw-r--r-- | arch/s390/kernel/stacktrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c index 44f84b23d4e5..355db9db8210 100644 --- a/arch/s390/kernel/stacktrace.c +++ b/arch/s390/kernel/stacktrace.c @@ -27,12 +27,12 @@ static int __save_address(void *data, unsigned long address, int nosched) return 1; } -static int save_address(void *data, unsigned long address) +static int save_address(void *data, unsigned long address, int reliable) { return __save_address(data, address, 0); } -static int save_address_nosched(void *data, unsigned long address) +static int save_address_nosched(void *data, unsigned long address, int reliable) { return __save_address(data, address, 1); } |