diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-24 13:48:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-24 13:48:26 +1000 |
| commit | b9b628b9290ff20661793566892720effe32a214 (patch) | |
| tree | 1261ea1959a10e1f7d74722681b6a60f2de413c0 /arch/s390/mm/init.c | |
| parent | 82b81857b6380079bd2c54ed9e5204a20e163fc5 (diff) | |
| parent | 210681b2460d2d6342fd02c22c317e0bf39c4ebf (diff) | |
Merge remote branch 'irqflags/master'
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 33f7a08646e0..d3a24e4b31af 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -113,7 +113,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); - __raw_local_irq_ssm(ssm_mask); + arch_local_irq_restore(ssm_mask); atomic_set(&init_mm.context.attach_count, 1); |