projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[linux-2.6-microblaze.git]
/
arch
/
s390
/
kernel
/
ipl.c
diff --git
a/arch/s390/kernel/ipl.c
b/arch/s390/kernel/ipl.c
index
50e2c21
..
e2cc357
100644
(file)
--- a/
arch/s390/kernel/ipl.c
+++ b/
arch/s390/kernel/ipl.c
@@
-179,8
+179,6
@@
static inline int __diag308(unsigned long subcode, void *addr)
int diag308(unsigned long subcode, void *addr)
{
int diag308(unsigned long subcode, void *addr)
{
- if (IS_ENABLED(CONFIG_KASAN))
- __arch_local_irq_stosm(0x04); /* enable DAT */
diag_stat_inc(DIAG_STAT_X308);
return __diag308(subcode, addr);
}
diag_stat_inc(DIAG_STAT_X308);
return __diag308(subcode, addr);
}
@@
-1843,7
+1841,6
@@
static struct kobj_attribute on_restart_attr = __ATTR_RW(on_restart);
static void __do_restart(void *ignore)
{
static void __do_restart(void *ignore)
{
- __arch_local_irq_stosm(0x04); /* enable DAT */
smp_send_stop();
#ifdef CONFIG_CRASH_DUMP
crash_kexec(NULL);
smp_send_stop();
#ifdef CONFIG_CRASH_DUMP
crash_kexec(NULL);
@@
-2082,7
+2079,7
@@
void s390_reset_system(void)
/* Disable lowcore protection */
__ctl_clear_bit(0, 28);
/* Disable lowcore protection */
__ctl_clear_bit(0, 28);
- diag_
dma
_ops.diag308_reset();
+ diag_
amode31
_ops.diag308_reset();
}
#ifdef CONFIG_KEXEC_FILE
}
#ifdef CONFIG_KEXEC_FILE