diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-29 13:26:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-29 13:26:04 +0800 |
| commit | c11a255c622e7a2d312f4080c6ef529dd67b3c38 (patch) | |
| tree | c7d36f8014e9da35e4b772cfdc1779ec0449d657 /arch/powerpc/mm/copro_fault.c | |
| parent | 273daee0be36235886622396eedb618fc5de0213 (diff) | |
| parent | 25f89e269f5c5d06594098cc3b1d97554249f3f9 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'arch/powerpc/mm/copro_fault.c')
| -rw-r--r-- | arch/powerpc/mm/copro_fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/mm/copro_fault.c b/arch/powerpc/mm/copro_fault.c index 6527882ce05e..ddfd2740a1b5 100644 --- a/arch/powerpc/mm/copro_fault.c +++ b/arch/powerpc/mm/copro_fault.c @@ -106,6 +106,8 @@ int copro_calculate_slb(struct mm_struct *mm, u64 ea, struct copro_slb *slb) switch (REGION_ID(ea)) { case USER_REGION_ID: pr_devel("%s: 0x%llx -- USER_REGION_ID\n", __func__, ea); + if (mm == NULL) + return 1; psize = get_slice_psize(mm, ea); ssize = user_segment_size(ea); vsid = get_vsid(mm->context.id, ea, ssize); |