Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / arch / s390 / mm / pgtable.c

diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 6b6ddc4ea02be082bf340c8ee662da7fe25d47a7..be6c1cf4ad5ae8922f039ab2100b2e50183553f2 100644 (file)
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -258,6 +258,10 @@ int s390_enable_sie(void)
        struct task_struct *tsk = current;
        struct mm_struct *mm, *old_mm;
 
+       /* Do we have switched amode? If no, we cannot do sie */
+       if (!switch_amode)
+               return -EINVAL;
+
        /* Do we have pgstes? if yes, we are done */
        if (tsk->mm->context.has_pgste)
                return 0;
@@ -292,7 +296,7 @@ int s390_enable_sie(void)
        tsk->mm = tsk->active_mm = mm;
        preempt_disable();
        update_mm(mm, tsk);
-       cpu_set(smp_processor_id(), mm->cpu_vm_mask);
+       cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
        preempt_enable();
        task_unlock(tsk);
        mmput(old_mm);