mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge remote-tracking branch 'sm8350/lineage-20' into lineage-22.2
* sm8350/lineage-20: ANDROID: Fix compilation error with huge_pmd_share() BACKPORT: mm/gup: Remove enfornced COW mechanism UPSTREAM: mm/userfaultfd: selftests: fix memory corruption with thp enabled UPSTREAM: mm/shmem: use page_mapping() to detect page cache for uffd continue UPSTREAM: mm/userfaultfd: fix memory corruption due to writeprotect UPSTREAM: mm: hugetlb: add missing cache flushing in hugetlb_unshare_all_pmds() BACKPORT: userfaultfd: wp: declare _UFFDIO_WRITEPROTECT conditionally BACKPORT: mm, mempolicy: fix up gup usage in lookup_node UPSTREAM: mm/mempolicy: Allow lookup_node() to handle fatal signal UPSTREAM: mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal UPSTREAM: mm/gup: fix fixup_user_fault() on multiple retries UPSTREAM: mm/gup: Mark lock taken only after a successful retake UPSTREAM: mm/userfaultfd: honor FAULT_FLAG_KILLABLE in fault path UPSTREAM: mm/gup: allow to react to fatal signals UPSTREAM: mm/gup: allow VM_FAULT_RETRY for multiple times UPSTREAM: mm: allow VM_FAULT_RETRY for multiple times UPSTREAM: mm: introduce FAULT_FLAG_INTERRUPTIBLE UPSTREAM: mm: introduce FAULT_FLAG_DEFAULT UPSTREAM: userfaultfd: don't retake mmap_sem to emulate NOPAGE UPSTREAM: mm: return faster for non-fatal signals in user mode faults ... Change-Id: I9d715b94bd5e1daaf1c3857facb03166aeba69e5
This commit is contained in:
commit
66b9cabfb9
491 changed files with 5963 additions and 3241 deletions
|
|
@ -116,7 +116,8 @@ struct qcom_smem_state *qcom_smem_state_get(struct device *dev,
|
|||
|
||||
if (args.args_count != 1) {
|
||||
dev_err(dev, "invalid #qcom,smem-state-cells\n");
|
||||
return ERR_PTR(-EINVAL);
|
||||
state = ERR_PTR(-EINVAL);
|
||||
goto put;
|
||||
}
|
||||
|
||||
state = of_node_to_state(args.np);
|
||||
|
|
|
|||
Loading…
Reference in a new issue