From patchwork Mon Apr 7 01:43:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 14039637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B24C5C3600C for ; Mon, 7 Apr 2025 01:44:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0F7C6B000A; Sun, 6 Apr 2025 21:43:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C9C816B000C; Sun, 6 Apr 2025 21:43:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEA426B000D; Sun, 6 Apr 2025 21:43:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8F1CE6B000A for ; Sun, 6 Apr 2025 21:43:59 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A5CB558C97 for ; Mon, 7 Apr 2025 01:43:59 +0000 (UTC) X-FDA: 83305551798.02.BB8287A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf10.hostedemail.com (Postfix) with ESMTP id 0619EC0006 for ; Mon, 7 Apr 2025 01:43:57 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="qWTbW/32"; spf=pass (imf10.hostedemail.com: domain of mhiramat@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=mhiramat@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743990238; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=Lcywq4p7m7DgIukKF4HecQ9Lv5b/LIL3uZbWeFwBWKw=; b=mU4IBkfmQlhOdW5puZL7WeDzDXBXqF8Rxwsilh+/DgcahkZV/tJmeMaNgNUUWibpJYhyHT mMSjx0ZXau+qQGIF0g1kDQnvHWMtpEbK7if/BafwvyJjzq+8hRJt6lx5jTpvVVjf1e3Ou1 O/1EinGW8lToo95k5k4HSOhJGg/ZEnA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743990238; a=rsa-sha256; cv=none; b=6gZWaw6a9/UwjfrJxegqaJRndYgMmrzdcIIIS2Aiqk70DhIA477ChWrMgRdRbodSpiluQ5 bnQlchem1x3wDNET6l2pD05EgKLngEcg+jTy3+qPA1w4kTKEZHfW6aBRvXzpFjHqlmwYOD 5mRrj4CpgCGvpH4yRlywuw0YKE4QgJ0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="qWTbW/32"; spf=pass (imf10.hostedemail.com: domain of mhiramat@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=mhiramat@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C1FA95C55E7; Mon, 7 Apr 2025 01:41:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26135C4CEE3; Mon, 7 Apr 2025 01:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743990236; bh=YaxfyaahaOVirPTxQFyiHvZmst3YssmDcY0w+WZuZgU=; h=From:To:Cc:Subject:Date:From; b=qWTbW/32IPeahfjqzPtj1A2/Bx18EVmxYADS1NW/pbZl4ep2dJusCRv+e0sdfKgON ZOqX/Dpnq8wqU+oA9RPB2gyNizfkYMrsiKMj2xn2h32Uw5R9XyotDCn+Zzswt2B6tP Ze/xgzD99fCizgreNgSisaFOXQ+qA34NSJlCBUYEaFeVEbOEkTRMu2zNtT84nqTlpj bZlJdye/LpjMyKcLd7vTz1i2Jb4a+kSL4f8Xb2Iwyw1iBUloGhuXfvD4TNo+vsrG5d 6sND+eSelbK61GRnSU0tKDdomkKM+ivDGZbUjwdn1W0Tswxwum/ao9ZKw4393c2YlD U1ts2dmrHc1pA== From: "Masami Hiramatsu (Google)" To: Wei Yang , Andrew Morton , Mike Rapoport Cc: Steven Rostedt , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Mark Rutland , Mathieu Desnoyers , linux-mm@kvack.org, Masami Hiramatsu Subject: [PATCH] memblock tests: Fix mutex related build error Date: Mon, 7 Apr 2025 10:43:51 +0900 Message-ID: <174399023133.47537.7375975856054461445.stgit@devnote2> X-Mailer: git-send-email 2.43.0 User-Agent: StGit/0.19 MIME-Version: 1.0 X-Stat-Signature: az7h6hnaj8r5s4b8r4xt1abnbyzwa6ad X-Rspam-User: X-Rspamd-Queue-Id: 0619EC0006 X-Rspamd-Server: rspam08 X-HE-Tag: 1743990237-461534 X-HE-Meta: U2FsdGVkX1/Jqjyd9xoOz6lhBpu3T8txg23zsGkfgx0Qi6QiWFgZWrA0Xehh9XKoTiJgG0Pnv5RmNegUyNnKxBBVllMj/ALjqF0JUJ9NDGam5nH5Fb57EG5h89dYyEiYSOYpWY9Z2kNn4oLEcecQf7ypI7wqTy3v5zhCQXzZBq60iJR5EKXjtBrgOE0uYVUwieCrFqMK1m8VmXM8cJxW8+ppIWgaavH/YxBJjKu5Z66zVOUANWzYLU/ky+qqseMpwteQVzjO2n5XnnEjlp/64+navRWJLIGaAY9wmouhL2xKeuqdoU/+fUvBOQ8DZaHJerhnx1yDRAbzADeLxhAZKj6l5Hcevyk7fuH544iY1PU/Np91devxxbR3HRyd2ixe1CYLUZvVoHo9xjkeJKMjGkwGPNigTYSTV+AJ1NoyCH6RgHkPSG9YY6M2B0O2jTmCx4wDrwwCanfK7Y8LAr8UCYrg0CYcnmpRrE2aUBYbL6ZjIsXRBWoPwaBd7mxfbbm0FBhZzFxY0wwcCKSChQgE5ebo8vsHrWEjPyGwj6IHMo3G/qFwJW/nxH/8H9XEU5eeDJayHH+0JTUsMqN7Wa9Uo3wHtEswBbfZg5NsjYrYkIeZ5r9xpohxgRTKe17CxHeba2VW8jYW5UImmo1nZk4XITyB1TfmB/CiPSuMjLHkepyeIJteKP4wowp+jiZOypWsFVTG248HBN6lMVpE5gyXgeX5CVofoEIU+wxa3+uJR9RYvuu0w/MsUkRKGaEN/OGWON6Zom0Xg+XBxMiRll6/9MqcxY0gZ9dVKgQKqKpjhXP6eP1n91kyCwTeAQ3r8Wb1ZNyOgH9ebHH5Gk7bZ2gTJJN436dJhK6peBHmfRfSk1yj1ZEoumMtDqZA4p9loAyxe+jrZwvh1uDLRlLRehhzf8MTUTWMe0uCHEC7mRFX+kadAjVSt3ceN+hz++FyEOmO2a88N2NGNoTlonnpqYI mHPHDizd g3gQvgIIPelPGfzX50R7VcsP8GEB+6ULcxeITBCEmP+RWQqyBM9mmCzHfw4BAuJolCaCZjoA0xZafHNScROdGAxRMHoA3w7dllM8Lj05w7qMVJj/m+L3gO612zbIOxq+K0d9/zikwO0xSdp7dPKDqGhSRF2kGvhD3q6qExad+bf07ifVc86xIyA+GshQSKF/5CorwOtLdgiOWAsFCGLtDPSdOggNNKJWILRMOa9CbpYMC5hOwOJ31nw05hAnK2eHsd1Ej74DWoVk3YEGGD3QrksIezJrATqIIpFs9UL0wnPOAzaokoV2CwPj8QdNtDNLHCPe/Oxu/dJCl+cc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Masami Hiramatsu (Google) Fix mutex and free_reserved_area() related build errors which have been introduced by commit 74e2498ccf7b ("mm/memblock: Add reserved memory release function"). Fixes: 74e2498ccf7b ("mm/memblock: Add reserved memory release function") Reported-by: Wei Yang Closes: https://lore.kernel.org/all/20250405023018.g2ae52nrz2757b3n@master/ Signed-off-by: Masami Hiramatsu (Google) --- tools/testing/memblock/internal.h | 6 ++++++ tools/testing/memblock/linux/mutex.h | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 tools/testing/memblock/linux/mutex.h diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h index 1cf82acb2a3e..0ab4b53bb4f3 100644 --- a/tools/testing/memblock/internal.h +++ b/tools/testing/memblock/internal.h @@ -24,4 +24,10 @@ static inline void accept_memory(phys_addr_t start, unsigned long size) { } +static inline unsigned long free_reserved_area(void *start, void *end, + int poison, const char *s) +{ + return 0; +} + #endif diff --git a/tools/testing/memblock/linux/mutex.h b/tools/testing/memblock/linux/mutex.h new file mode 100644 index 000000000000..ae3f497165d6 --- /dev/null +++ b/tools/testing/memblock/linux/mutex.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _MUTEX_H +#define _MUTEX_H + +#define DEFINE_MUTEX(name) int name + +static inline void dummy_mutex_guard(int *name) +{ +} + +#define guard(mutex) \ + dummy_##mutex##_guard + +#endif /* _MUTEX_H */ \ No newline at end of file