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 B5D311AAE3B; Mon, 14 Oct 2024 15:18:34 +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=1728919114; cv=none; b=KBM6XMfCxkaz5v5FdSnWZm3cF9gwG4Z2oqitaSTj3NABEdczB7WKazzP18t5O3IUuQDhrd45V6rNLxbaYmrnhmyRKdvUvTkQSoQxkPydQ/OREyheTfiQlj7Sq+eWQ75ZKkTXH8XyIooUUupKez6ELMj0oVQTQo/cBV5OiJ5V1V8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919114; c=relaxed/simple; bh=NSf9WtH3zcsjBDMdqXtFn4gZo5dex9hlA5tdvAsQUqU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lhPNUMGlWMV0tMj1w1q3SnVYhqwYeYYcv8ZU3OdJ+8PBoEMlnTJjl/nmrPW27tzpgCdOIZ7RYRzDEKsSvJNAwN/MN260XrFoXHUPI+W1qQDH1DCEDAOImTinBvocfwuran1V56PDW9uU3EJK1tQ9r5nYh5k1APvhhF2R6mECnTA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=irvGl1hG; 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="irvGl1hG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 272BAC4CEC3; Mon, 14 Oct 2024 15:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728919114; bh=NSf9WtH3zcsjBDMdqXtFn4gZo5dex9hlA5tdvAsQUqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=irvGl1hGKqtLLM2VBv98+/gqJ9txHT4iPjvpU7VtnPTLHYBgo9H4+aLaIL+9qY80V qv+fPfBpBizCX7wcYOUw+ZesX2xc7JWX5nwXmQTHqxhbx7r4wcRgXYlWyJngPOU/nG V0GMwcUf/oUAOy99lkF4d8qy6kKGCvFv4OiifN14= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe Leroy , Shuah Khan , "Jason A. Donenfeld" , Sasha Levin Subject: [PATCH 6.1 517/798] selftests: vDSO: fix vdso_config for powerpc Date: Mon, 14 Oct 2024 16:17:51 +0200 Message-ID: <20241014141238.290275282@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe Leroy [ Upstream commit 7d297c419b08eafa69ce27243ee9bbecab4fcaa4 ] Running vdso_test_correctness on powerpc64 gives the following warning: ~ # ./vdso_test_correctness Warning: failed to find clock_gettime64 in vDSO This is because vdso_test_correctness was built with VDSO_32BIT defined. __powerpc__ macro is defined on both powerpc32 and powerpc64 so __powerpc64__ needs to be checked first in vdso_config.h Fixes: 693f5ca08ca0 ("kselftest: Extend vDSO selftest") Signed-off-by: Christophe Leroy Acked-by: Shuah Khan Signed-off-by: Jason A. Donenfeld Signed-off-by: Sasha Levin --- tools/testing/selftests/vDSO/vdso_config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/vDSO/vdso_config.h b/tools/testing/selftests/vDSO/vdso_config.h index cdfed403ba13f..f9890584f6fb4 100644 --- a/tools/testing/selftests/vDSO/vdso_config.h +++ b/tools/testing/selftests/vDSO/vdso_config.h @@ -18,13 +18,13 @@ #elif defined(__aarch64__) #define VDSO_VERSION 3 #define VDSO_NAMES 0 -#elif defined(__powerpc__) +#elif defined(__powerpc64__) #define VDSO_VERSION 1 #define VDSO_NAMES 0 -#define VDSO_32BIT 1 -#elif defined(__powerpc64__) +#elif defined(__powerpc__) #define VDSO_VERSION 1 #define VDSO_NAMES 0 +#define VDSO_32BIT 1 #elif defined (__s390__) #define VDSO_VERSION 2 #define VDSO_NAMES 0 -- 2.43.0