diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2021-04-12 13:45:38 +0300 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2021-04-12 13:45:38 +0300 |
| commit | 0ee3f73914d93e47bb0146371bc66ca2982970c9 (patch) | |
| tree | a93c8c65f92862aa77c7d348bddb0054aa59097e /arch/s390/include | |
| parent | 8bc00c04d87ee151fb8fe18ed7e7af8c785843f2 (diff) | |
| parent | a994eddb947ea9ebb7b14d9a1267001699f0a136 (diff) | |
| download | linux-0ee3f73914d93e47bb0146371bc66ca2982970c9.tar.xz | |
Merge branch 'fixes' into features
* fixes:
s390/entry: save the caller of psw_idle
s390/entry: avoid setting up backchain in ext|io handlers
s390/setup: use memblock_free_late() to free old stack
s390/irq: fix reading of ext_params2 field from lowcore
s390/unwind: add machine check handler stack
s390/cpcmd: fix inline assembly register clobbering
MAINTAINERS: add backups for s390 vfio drivers
s390/vdso: fix initializing and updating of vdso_data
s390/vdso: fix tod_steering_delta type
s390/vdso: copy tod_steering_delta value to vdso_data page
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/stacktrace.h | 1 | ||||
| -rw-r--r-- | arch/s390/include/asm/vdso/data.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/asm/stacktrace.h b/arch/s390/include/asm/stacktrace.h index ee056f4a4fa3..2b543163d90a 100644 --- a/arch/s390/include/asm/stacktrace.h +++ b/arch/s390/include/asm/stacktrace.h @@ -12,6 +12,7 @@ enum stack_type { STACK_TYPE_IRQ, STACK_TYPE_NODAT, STACK_TYPE_RESTART, + STACK_TYPE_MCCK, }; struct stack_info { diff --git a/arch/s390/include/asm/vdso/data.h b/arch/s390/include/asm/vdso/data.h index 7b3cdb4a5f48..73ee89142666 100644 --- a/arch/s390/include/asm/vdso/data.h +++ b/arch/s390/include/asm/vdso/data.h @@ -6,7 +6,7 @@ #include <vdso/datapage.h> struct arch_vdso_data { - __u64 tod_steering_delta; + __s64 tod_steering_delta; __u64 tod_steering_end; }; |