diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:05 -0500 |
| commit | ca89bc248e2fac44d6374a48b8d38b068c7a1bdf (patch) | |
| tree | 0c10af2a5f22a1ad0283023d403022ce6b84ebc4 /arch/s390/kernel/debug.c | |
| parent | 9645083ca5ef365b7b750cf219bb20b61bb925f8 (diff) | |
| parent | 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a (diff) | |
Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus
Diffstat (limited to 'arch/s390/kernel/debug.c')
| -rw-r--r-- | arch/s390/kernel/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index f1279dc2e1bc..17d62fe5d7b7 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
| @@ -867,7 +867,7 @@ static inline void | |||
| 867 | debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level, | 867 | debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level, |
| 868 | int exception) | 868 | int exception) |
| 869 | { | 869 | { |
| 870 | active->id.stck = get_tod_clock(); | 870 | active->id.stck = get_tod_clock_fast(); |
| 871 | active->id.fields.cpuid = smp_processor_id(); | 871 | active->id.fields.cpuid = smp_processor_id(); |
| 872 | active->caller = __builtin_return_address(0); | 872 | active->caller = __builtin_return_address(0); |
| 873 | active->id.fields.exception = exception; | 873 | active->id.fields.exception = exception; |