The patch titled
Subject: mm/hugetlb_cgroup: fix a -Wunused-but-set-variable
has been removed from the -mm tree. Its filename was
hugetlb_cgroup-add-interface-for-charge-uncharge-hugetlb-reservations-fix.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: Qian Cai <cai@xxxxxx>
Subject: mm/hugetlb_cgroup: fix a -Wunused-but-set-variable
The commit c32300516047 ("hugetlb_cgroup: add interface for
charge/uncharge hugetlb reservations") forgot to remove an unused
variable,
mm/hugetlb_cgroup.c: In function 'hugetlb_cgroup_migrate':
mm/hugetlb_cgroup.c:777:25: warning: variable 'h_cg' set but not used
[-Wunused-but-set-variable]
struct hugetlb_cgroup *h_cg;
^~~~
Link: http://lkml.kernel.org/r/1581953454-10671-1-git-send-email-cai@xxxxxx
Signed-off-by: Qian Cai <cai@xxxxxx>
Cc: Mina Almasry <almasrymina@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb_cgroup.c | 2 --
1 file changed, 2 deletions(-)
--- a/mm/hugetlb_cgroup.c~hugetlb_cgroup-add-interface-for-charge-uncharge-hugetlb-reservations-fix
+++ a/mm/hugetlb_cgroup.c
@@ -786,7 +786,6 @@ void __init hugetlb_cgroup_file_init(voi
*/
void hugetlb_cgroup_migrate(struct page *oldhpage, struct page *newhpage)
{
- struct hugetlb_cgroup *h_cg;
struct hugetlb_cgroup *h_cg_rsvd;
struct hstate *h = page_hstate(oldhpage);
@@ -795,7 +794,6 @@ void hugetlb_cgroup_migrate(struct page
VM_BUG_ON_PAGE(!PageHuge(oldhpage), oldhpage);
spin_lock(&hugetlb_lock);
- h_cg = hugetlb_cgroup_from_page(oldhpage);
h_cg_rsvd = hugetlb_cgroup_from_page_rsvd(oldhpage);
set_hugetlb_cgroup(oldhpage, NULL);
_
Patches currently in -mm which might be from cai@xxxxxx are
mm-frontswap-mark-various-intentional-data-races.patch
mm-page_io-mark-various-intentional-data-races.patch
mm-page_io-mark-various-intentional-data-races-v2.patch
mm-swap_state-mark-various-intentional-data-races.patch
mm-kmemleak-annotate-various-data-races-obj-ptr.patch
mm-swapfile-fix-and-annotate-various-data-races.patch
mm-swapfile-fix-and-annotate-various-data-races-v2.patch
mm-page_counter-fix-various-data-races-at-memsw.patch
mm-memcontrol-fix-a-data-race-in-scan-count.patch
mm-list_lru-fix-a-data-race-in-list_lru_count_one.patch
mm-mempool-fix-a-data-race-in-mempool_free.patch
mm-util-annotate-an-data-race-at-vm_committed_as.patch
mm-rmap-annotate-a-data-race-at-tlb_flush_batched.patch
fork-annotate-a-data-race-in-vm_area_dup.patch
mm-annotate-a-data-race-in-page_zonenum.patch
