diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:27:24 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:27:24 +0800 |
| commit | ffba0bcddf3329d5d411552230267147efc6ffc3 (patch) | |
| tree | 08149d70a3cb3792bf615d27f3f98b93d7fa810d /arch/powerpc/mm/copro_fault.c | |
| parent | 4450e96693acc193205906318b0f6e6e6eca4e64 (diff) | |
| parent | 2e67ba554184199114a948786e47decb8b9a469b (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlinux-linaro-lsk-v3.18-android-test
Conflicts:
skip stable commit 27c872851 u_ether: don't starve tx request queue
in drivers/usb/gadget/function/u_ether.c, since it isn't fit in 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 1b5305d4bdab..575b871c3887 100644 --- a/arch/powerpc/mm/copro_fault.c +++ b/arch/powerpc/mm/copro_fault.c @@ -102,6 +102,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); |