diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-30 11:49:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-30 11:49:48 +0000 |
| commit | 7b20a98a85946fd07558d4c00ed4feb366e0883f (patch) | |
| tree | 81b6a0705f6e9cac0a289aa1910a8a7068fab20f | |
| parent | 680acbd972a94895cc009bb55132354a117cf504 (diff) | |
| parent | 432d723c46a170fa8fabfd35981a1dd1525894ab (diff) | |
| download | common-patches-7b20a98a85946fd07558d4c00ed4feb366e0883f.tar.gz | |
Merge changes If9caece8,I762c1f4a into main
* changes:
aosp/android-mainline: update series (rebase onto v6.7-rc8-177-g52b1853b080a0)
aosp/android-mainline: update series
| -rw-r--r-- | android-mainline/Revert-mm-align-larger-anonymous-mappings-on-THP-boundaries.patch | 33 | ||||
| -rw-r--r-- | android-mainline/series | 5 |
2 files changed, 36 insertions, 2 deletions
diff --git a/android-mainline/Revert-mm-align-larger-anonymous-mappings-on-THP-boundaries.patch b/android-mainline/Revert-mm-align-larger-anonymous-mappings-on-THP-boundaries.patch new file mode 100644 index 00000000..e9093c03 --- /dev/null +++ b/android-mainline/Revert-mm-align-larger-anonymous-mappings-on-THP-boundaries.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@google.com> +Date: Mon, 15 Jan 2024 11:13:28 +0000 +Subject: Revert "mm: align larger anonymous mappings on THP boundaries" + +This reverts commit efa7df3e3bb5da8e6abbe37727417f32a37fba47. + +It causes testing failures due to a lack of entropy in the system, so +revert it for now. This has been reported to upstream, hopefully it +gets resolved soon there. + +Bug: 254683164 +Link: https://lore.kernel.org/all/CAJuCfpHXLdQy1a2B6xN2d7quTYwg2OoZseYPZTRpU0eHHKD-sQ@mail.gmail.com/ +Cc: Suren Baghdasaryan <surenb@google.com> +Change-Id: I36bb4981fe7782a63ab90406dead59fea6d2ae42 +Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> +--- + mm/mmap.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/mm/mmap.c b/mm/mmap.c +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -1829,9 +1829,6 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, + */ + pgoff = 0; + get_area = shmem_get_unmapped_area; +- } else if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { +- /* Ensures that larger anonymous mappings are THP aligned. */ +- get_area = thp_get_unmapped_area; + } + + addr = get_area(file, addr, len, pgoff, flags); diff --git a/android-mainline/series b/android-mainline/series index 2cfb3991..0287095a 100644 --- a/android-mainline/series +++ b/android-mainline/series @@ -1,8 +1,8 @@ # # android-mainline patches # -# Applies onto upstream 95c8a35f1c017 Linux v6.7-rc8-174-g95c8a35f1c017 -# Matches android-mainline 34bd5a3324056 ("Merge 95c8a35f1c01 ("Merge tag 'mm-hotfixes-stable-2024-01-05-11-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline") +# Applies onto upstream 52b1853b080a0 Linux v6.7-rc8-177-g52b1853b080a0 +# Matches android-mainline 564c96e25b892 ("Merge 52b1853b080a ("Merge tag 'i2c-for-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline") # Status: Tested # Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch @@ -21,6 +21,7 @@ Revert-sched-debug-Remove-the-proc-sys-kernel-sched_child_runs_first-sysctl.patc Revert-crypto-pkcs7-remove-sha1-support.patch Revert-usb-typec-tcpm-fix-cc-role-at-port-reset-2.patch ANDROID-Revert-gen_compile_commands.py-fix-path-resolve-with-symlinks-in-it.patch +Revert-mm-align-larger-anonymous-mappings-on-THP-boundaries.patch _____ANNOTATION-pending-upstream_____.patch UPSTREAM-fuse-fix-matching-of-FUSE_DEV_IOC_CLONE-command.patch FROMLIST-fuse-Definitions-and-ioctl-for-passthrough.patch |