diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:55:09 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:55:09 -0800 |
| commit | 4f97f8f5f0664bdcfffe74e7d2a841f55a0e88e2 (patch) | |
| tree | 49165c5065d121130e0436e647b9a650f0da41cb /arch/s390/mm/init.c | |
| parent | 0e781c2258ffb2a42bf44f62dea8662f38cbfd34 (diff) | |
| parent | 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 (diff) | |
| download | kernel_replicant_linux-4f97f8f5f0664bdcfffe74e7d2a841f55a0e88e2.tar.gz kernel_replicant_linux-4f97f8f5f0664bdcfffe74e7d2a841f55a0e88e2.tar.bz2 kernel_replicant_linux-4f97f8f5f0664bdcfffe74e7d2a841f55a0e88e2.zip | |
Merge 4.5-rc2 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/mm/init.c')
| -rw-r--r-- | arch/s390/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index c722400c7697..73e290337092 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -98,7 +98,7 @@ void __init paging_init(void) __ctl_load(S390_lowcore.kernel_asce, 1, 1); __ctl_load(S390_lowcore.kernel_asce, 7, 7); __ctl_load(S390_lowcore.kernel_asce, 13, 13); - arch_local_irq_restore(4UL << (BITS_PER_LONG - 8)); + __arch_local_irq_stosm(0x04); sparse_memory_present_with_active_regions(MAX_NUMNODES); sparse_init(); |