The patch titled Subject: ipc/shm.c: don't use auto variable hs in newseg() has been removed from the -mm tree. Its filename was ipc-shmc-dont-use-auto-variable-hs-in-newseg.patch This patch was dropped because an alternative patch was merged ------------------------------------------------------ From: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Subject: ipc/shm.c: don't use auto variable hs in newseg() Fix "warning: unused variable 'hs'" when !CONFIG_HUGETLB_PAGE introduced by commit af73e4d9506d "hugetlbfs: fix mmap failure in unaligned size request". Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Reported-by: Borislav Petkov <bp@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/shm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN ipc/shm.c~ipc-shmc-dont-use-auto-variable-hs-in-newseg ipc/shm.c --- a/ipc/shm.c~ipc-shmc-dont-use-auto-variable-hs-in-newseg +++ a/ipc/shm.c @@ -491,9 +491,8 @@ static int newseg(struct ipc_namespace * sprintf (name, "SYSV%08x", key); if (shmflg & SHM_HUGETLB) { - struct hstate *hs = hstate_sizelog((shmflg >> SHM_HUGE_SHIFT) - & SHM_HUGE_MASK); - size_t hugesize = ALIGN(size, huge_page_size(hs)); + size_t hugesize = ALIGN(size, huge_page_size(hstate_sizelog( + (shmflg >> SHM_HUGE_SHIFT) & SHM_HUGE_MASK))); /* hugetlb_file_setup applies strict accounting */ if (shmflg & SHM_NORESERVE) _ Patches currently in -mm which might be from n-horiguchi@xxxxxxxxxxxxx are origin.patch shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size.patch shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html