diff options
| author | Ingo Molnar | 2015-03-04 06:35:43 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2015-03-04 06:35:43 +0100 |
| commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
| tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /arch/s390/include/asm/reset.h | |
| parent | x86/compat: Remove sys32_vm86_warning (diff) | |
| parent | Linux 4.0-rc2 (diff) | |
| download | kernel-qcow2-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.tar.gz kernel-qcow2-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.tar.xz kernel-qcow2-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.zip | |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/include/asm/reset.h')
| -rw-r--r-- | arch/s390/include/asm/reset.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/asm/reset.h b/arch/s390/include/asm/reset.h index 804578587a7a..72786067b300 100644 --- a/arch/s390/include/asm/reset.h +++ b/arch/s390/include/asm/reset.h @@ -15,5 +15,6 @@ struct reset_call { extern void register_reset_call(struct reset_call *reset); extern void unregister_reset_call(struct reset_call *reset); -extern void s390_reset_system(void (*func)(void *), void *data); +extern void s390_reset_system(void (*fn_pre)(void), + void (*fn_post)(void *), void *data); #endif /* _ASM_S390_RESET_H */ |