Received: by 2002:ab2:6a05:0:b0:1f8:1780:a4ed with SMTP id w5csp374782lqo; Fri, 10 May 2024 02:33:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVWGwkITOylnOCRCy7ThDIcVeMarSEdedb6Ig7S34fibjTRHI7OQgo+JY0WZ/aHRFPmLnKxNKqznZmMP1R5Roul256gOIKqJnXl0IGypQ== X-Google-Smtp-Source: AGHT+IEMpfPhUw+oc74jTYSYcT01AVwjWZzNFh3vU+LV0YErdVmQ/ksi8Cs1i/Q1khSQT12vnAoC X-Received: by 2002:a17:902:e849:b0:1eb:5291:d3cd with SMTP id d9443c01a7336-1ef44161e66mr25622615ad.49.1715333609661; Fri, 10 May 2024 02:33:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715333609; cv=pass; d=google.com; s=arc-20160816; b=Fieht3p9pZy53vw0nurWnxNf7IsXkSVlL75qhWhe12EEzLU+b612CcR7mYDjWcnJq4 FGLamYK59n5RdEJZnZZeXXhJ0fhFN30rD0L+W3vgo57B7j61gjH6D/gPFnR2nMh/lRzK CqOOWkj5RD0FOvRr2EqRavPVUSwshQVyKA+FfFajTVzU+vOyy3A4GZz4q5z0B9Fnuvmm 7qp8vQvZpEf5CH13pNdg2oMa18Px9Y/GSOwSOpHtnPTd50i0uKqVeKxIfzfXLKtXeW/l eID8xytXWmbHFg40mdiqlmSo3oMP3dvq2+teG+GuYbgvdaukML4vT3azVEAjopUigDzF Nxrg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=Mz+QntpnKV73Xce3+GpAUXu4jGV2SHVfVGWrzWB5ATM=; fh=ZPQrzhNGhQ5j1mBI4nwmdGxR9abhwWItmW3JtcWVJVQ=; b=CKVemllxKJyWXfXbmXOW228qHu+fAhUU6z65EnMGFmDToY3DP3iDqRU39kAQwkmQT5 QgMOyA0GfqT/64gsBrrgHrP7mG6yKRyjYGGm3fdXuyui7oZbsOUGMqwDxXmYXROPJo0J 8IkYST75eozI1jBVbnnbCthNTRs4kHAQs/sdZctNI5TmiVOhosTHEYGxejSKsSrJ4LtJ R4Sz4X5HIgSzXp+2JAEOE1WYBiRXQFvs5rdOpSzc5jAF8k449UvCl24XlTj4KG+Ny6H8 ZmyJVmUa3zRJozp4R6/DOCJcS/11uOqKY2olWNqNmJlIZh0GO7fzu5+RUYm1isxkAn8f PLdQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-11-20 header.b=ZglHCqGD; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel+bounces-175533-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-175533-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=oracle.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d9443c01a7336-1ef0c368296si34165685ad.625.2024.05.10.02.33.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 02:33:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-175533-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-11-20 header.b=ZglHCqGD; arc=pass (i=1 spf=pass spfdomain=oracle.com dkim=pass dkdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-kernel+bounces-175533-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-175533-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=oracle.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4D41B2814A4 for ; Fri, 10 May 2024 09:33:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 60660161337; Fri, 10 May 2024 09:33:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="ZglHCqGD" Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 7EB83161320 for ; Fri, 10 May 2024 09:33:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.177.32 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715333604; cv=none; b=QTpsGQfAe9FBZ7YJOiKAJ4VFEOyrMcj7TadIkl7Yks79iBksNW/bJxTr7NrNOLZIpz+p1AR55IuIcvIkhzqsb8PEGBOm6RoFK/xzHWFiZYt8Sw7ouCECHX4EohxyvAESjG4nJReJC87uS26bmQQ8WNzNInAbRoANvvIttYE56zk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715333604; c=relaxed/simple; bh=efzkN/Q2La52OaF3L6FCw9JzyepB+Tla3zYLJlpuFbo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OvpXS3L8csUcogQWj/EMi7T2wdp5Ym/zlc8uvrlfsbV1/XGWJ8Lqk8xuBkz/i4eZiI0bSoemZ/wZRvdiOc/8UBk98xtOlBP/FBGRk2CFGntnguU8oZrBl43nHDEjgarIIx95CYOlVn2mRu68dz5McwLgCMC/IMQ5+HpxSQnE/gg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=ZglHCqGD; arc=none smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44A7ZIuP018888; Fri, 10 May 2024 09:33:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=Mz+QntpnKV73Xce3+GpAUXu4jGV2SHVfVGWrzWB5ATM=; b=ZglHCqGD8u7Yvpkto//htCa/mRF69vAcGv1+HDfPLiCi0gQ+9w5XSYV+KAbv/gnd7ME7 1mXc/HOI/uLc921aNsOOdel6eBXnqkDrIFwB1xoMWYY8yyULlpVItko6bZsLmCTEjG+7 148UjbE78CRz+3P0th/guEsujUcGkfvXGZWndOSPiBwZudzNqOMajU+AN7XYBfJ8O0dQ i09it2nKhLE1wonEZhxtdeWlVnVgNv0D7VC5LGfOchzxmkump6Jic5H3uFodOKWA4Qkc bRz7IEvrF72X8CtVd3yvvoMrqQIw6Do+CZKwIRvF+odojjW9/qnQ/FcligbzXz/n81cD FA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y17x7rrge-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 10 May 2024 09:33:06 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44A98Mcw030898; Fri, 10 May 2024 09:33:05 GMT Received: from localhost.uk.oracle.com (dhcp-10-175-179-215.vpn.oracle.com [10.175.179.215]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3xysfpka7v-1; Fri, 10 May 2024 09:33:05 +0000 From: Siddh Raman Pant To: Josh Poimboeuf , Peter Zijlstra Cc: linux-kernel Subject: [PATCH] objtool: builtin-check: Use "action" in opts_valid error message to be consistent with help Date: Fri, 10 May 2024 15:02:57 +0530 Message-ID: <20240510093257.82634-1-siddh.raman.pant@oracle.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-10_06,2024-05-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405100068 X-Proofpoint-GUID: z8I8B-BGM0Ky-o-BL4foi0-3vN8xCN6h X-Proofpoint-ORIG-GUID: z8I8B-BGM0Ky-o-BL4foi0-3vN8xCN6h The help message mentions the main options as "actions", which is different from the optional "options". But the check error messages outputs "option" or "command" for referring to actions. Hence, make the error messages consistent with help. Signed-off-by: Siddh Raman Pant --- tools/objtool/builtin-check.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index 5e21cfb7661d..387d56a7f5fb 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -144,7 +144,7 @@ static bool opts_valid(void) opts.static_call || opts.uaccess) { if (opts.dump_orc) { - ERROR("--dump can't be combined with other options"); + ERROR("--dump can't be combined with other actions"); return false; } @@ -159,7 +159,7 @@ static bool opts_valid(void) if (opts.dump_orc) return true; - ERROR("At least one command required"); + ERROR("At least one action required"); return false; } -- 2.43.0