diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 17:06:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 17:06:37 -0400 |
commit | 45b74a65b9934d5e1520d97aa4e09cf2b8c69ac0 (patch) | |
tree | 7c451271a6c274da9b7f37fcb2592d4cfc972644 /arch/parisc/kernel/processor.c | |
parent | 433bcf67370bc170a345634aa1be4ee8ac905de9 (diff) | |
parent | dbf2a4b1ffab2867505be3b24221d5efa2200c91 (diff) |
Merge branch 'parisc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull more parisc updates from Helge Deller:
- fix boot failure of 64-bit kernel. It got broken by the unwind
optimization commit in merge window.
- fix 64-bit userspace support (static 64-bit applications only, e.g.
we don't yet have 64-bit userspace support in glibc).
- consolidate unwind initialization code.
- add machine model description to stack trace.
* 'parisc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Add hardware description to stack traces
parisc: Fix boot failure of 64-bit kernel
parisc: Consolidate unwind initialization calls
parisc: Update comments in syscall.S regarding wide userland
parisc: Fix ptraced 64-bit applications to call 64-bit syscalls
parisc: Restore possibility to execute 64-bit applications
Diffstat (limited to 'arch/parisc/kernel/processor.c')
-rw-r--r-- | arch/parisc/kernel/processor.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index 45cc65902fce..82bd0d0927ce 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
@@ -288,6 +288,8 @@ void __init collect_boot_cpu_data(void) | |||
288 | printk(KERN_INFO "model %s\n", | 288 | printk(KERN_INFO "model %s\n", |
289 | boot_cpu_data.pdc.sys_model_name); | 289 | boot_cpu_data.pdc.sys_model_name); |
290 | 290 | ||
291 | dump_stack_set_arch_desc("%s", boot_cpu_data.pdc.sys_model_name); | ||
292 | |||
291 | boot_cpu_data.hversion = boot_cpu_data.pdc.model.hversion; | 293 | boot_cpu_data.hversion = boot_cpu_data.pdc.model.hversion; |
292 | boot_cpu_data.sversion = boot_cpu_data.pdc.model.sversion; | 294 | boot_cpu_data.sversion = boot_cpu_data.pdc.model.sversion; |
293 | 295 | ||