From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EED42AE94; Thu, 23 May 2024 13:18:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716470317; cv=none; b=vFHjuFU7pC645IAh77Y9loZbyd6QKipoq3JVLXxhKRlODySIWbQF2vUJpxBvd3ap+ZzaUmq3xqL+4kZZD2q4YXNauFqLzjC8EM0v635tmYH6Zpv4XGjqLJVQhqThvTnvK2iwXmqmsPEmxVfGtBnk1yg9rU8S1NZ0HKSKjeZkqAA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716470317; c=relaxed/simple; bh=1Oi5p6zqs0IQSz3zI82ta9LM+uVuiKVJdmTjsIo2Yyw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ojokQt8IyY0syprlfDqe+oKVA5cK1Rz1iHf+ZSBxOuntvuBTWwtUw64ymvyUQXnmfOhyv0lTKe1qfrLnE+HhzHvaY4hOhzQ3pJCluYuQUrVguXkLVohamLPwhPPzw8VRIn1SggTiBYD9JhVwZ3m83cwTew2FMbALgtQlIRoVFis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=s2R5pn0i; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="s2R5pn0i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08EC5C3277B; Thu, 23 May 2024 13:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1716470317; bh=1Oi5p6zqs0IQSz3zI82ta9LM+uVuiKVJdmTjsIo2Yyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s2R5pn0isdjl90LYpbB1msYoHLucUO1uX5KjJpCxzpjc6YALfNWvBelfwMWh/soOZ TlmuprfjYlSOkkIC3ACSoYb9Go9Ao846Or4wNazMlEnWozyOUj+bc6EoTvlG95dlf2 QNRSIbCYYFCxjfR92kD73uJeOWe1QOWpKvWuMLNc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "sashal@kernel.org, vegard.nossum@oracle.com, darren.kenny@oracle.com, Harshit Mogalapalli" , Harshit Mogalapalli Subject: [PATCH 5.15 05/23] Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems" Date: Thu, 23 May 2024 15:13:01 +0200 Message-ID: <20240523130328.160831758@linuxfoundation.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523130327.956341021@linuxfoundation.org> References: <20240523130327.956341021@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ This reverts commit 0d29b474fb90ff35920642f378d9baace9b47edd which is commit 91b80cc5b39f00399e8e2d17527cad2c7fa535e2 upstream. map_hugetlb.c:18:10: fatal error: vm_util.h: No such file or directory 18 | #include "vm_util.h" | ^~~~~~~~~~~ compilation terminated. vm_util.h is not present in 5.15.y, as commit:642bc52aed9c ("selftests: vm: bring common functions to a new file") is not present in stable kernels <=6.1.y Signed-off-by: Harshit Mogalapalli --- tools/testing/selftests/vm/map_hugetlb.c | 7 ------- 1 file changed, 7 deletions(-) --- a/tools/testing/selftests/vm/map_hugetlb.c +++ b/tools/testing/selftests/vm/map_hugetlb.c @@ -15,7 +15,6 @@ #include #include #include -#include "vm_util.h" #define LENGTH (256UL*1024*1024) #define PROTECTION (PROT_READ | PROT_WRITE) @@ -71,16 +70,10 @@ int main(int argc, char **argv) { void *addr; int ret; - size_t hugepage_size; size_t length = LENGTH; int flags = FLAGS; int shift = 0; - hugepage_size = default_huge_page_size(); - /* munmap with fail if the length is not page aligned */ - if (hugepage_size > length) - length = hugepage_size; - if (argc > 1) length = atol(argv[1]) << 20; if (argc > 2) {