Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp706354pxb; Thu, 31 Mar 2022 15:36:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFRl5X6mCrL6PUGqeZs97pYoj+pBE9uImi9ipRuacGINeplMG05MryJzUTex6yGtSCJKx/ X-Received: by 2002:a17:902:dac2:b0:154:5d6d:cd02 with SMTP id q2-20020a170902dac200b001545d6dcd02mr7556144plx.123.1648766200276; Thu, 31 Mar 2022 15:36:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648766200; cv=none; d=google.com; s=arc-20160816; b=cK8p3kQnHJoV4vNnAqs48TJ8lUbB18Fpw69vQzMHj7WHr9YqQ8IwvDvYRlbmn0PKVy teUUdBu2e5e9j8gzgCkdV2IgfzkgdYFbp/SjjDXlcIzOwz1LQiWfFb3i1lQEBegVnpVh wSg9SeBSNYKl4RwrF1+Rjbo0naoMXy6LSERhus0MLLjOudfSWxGA+gRMRr6TGvXqkWlQ pmepL6YmNDzNTGnehlpBSf6stdNNmV3/syGd4ZK2bBQtlrQ/0IQSY/wR9BTabzOUZmBn do1JQjyb7FvI4RwurfTg2Oah3QNWVIa9AmwEuU3f4WEjCQfmjSkgW8q+wfYB/9Vw6kEL qL3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=p0SI8Zr4usVXygojRVj9PQzo4xpKDMqXyasdKNJl6dQ=; b=Pb5wlqycfR3fi8hZXSkCR0pNafit1Me7o461dRyzhkWplLm9pocDEq7jCDu5whmxnT oG8pat3QxRkSk/VRRdcAKVZgiL6j2/h5ts/5W1iZ3mF0XBfZ9TpkW+9qUEAZl0K5fHKl o+tuACZWCckjE/VewGptEYw0267x8D0NxGrTpSkFfICdvlRdGYSD7Bzz3XtpzRRW54Bh fU2gvAVOhy3SzcFJPt9xfpQw3k/jTVMdkpqC8wOSHL30SxgM8xgJEwaQ5H9rp8XkxTwJ JA9gTn9utwc+sJYFpTeKRqQpwxxQVxsPDLRNpfGviyDu9y+lL0hEeHmXqriRV2Qw4X4q rG4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DmY7Pe8H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g7-20020a056a001a0700b004fb47469b7asi802151pfv.87.2022.03.31.15.36.26; Thu, 31 Mar 2022 15:36:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DmY7Pe8H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233426AbiCaSHr (ORCPT + 99 others); Thu, 31 Mar 2022 14:07:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232396AbiCaSHp (ORCPT ); Thu, 31 Mar 2022 14:07:45 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09F80231AF7 for ; Thu, 31 Mar 2022 11:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648749958; x=1680285958; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xth3KXsNwWBTtSUKoBZ9z4UPFb5Rq2UtgMAzsLzZtQw=; b=DmY7Pe8HCVO8vK1efZn2FPEpm6RKuyu5bAGAjdqcyCzR/4dEqkevluyl P/+NzMmFFdISTsiJLzLcVMip0Ry7WKV51VrSGQAC9OU3iQWSSyALCmVhf 5qaqyaDP1VJAHqo+BrFJIx6oZgEUB4v0v/rPvPnUphcJ+vShmDgIQkPMY X/EUGnm0peofPRvNEOpshRUQR5NQp00IUAr5B04CBSKA/lff04W9J8B9z JRarH3JN2pfGxdZQTgLTmFsnX8SnCxqS8KalfjuDYFCwAl+hAfjrK2yAs BcjOiAP8k8G2/xOgSySYIzRovK7ZihpxzWXyBLRyUJV6Kx+DXp1JJg+UR w==; X-IronPort-AV: E=McAfee;i="6200,9189,10302"; a="259891743" X-IronPort-AV: E=Sophos;i="5.90,225,1643702400"; d="scan'208";a="259891743" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2022 11:05:57 -0700 X-IronPort-AV: E=Sophos;i="5.90,225,1643702400"; d="scan'208";a="720560502" Received: from jccornej-mobl.amr.corp.intel.com (HELO localhost) ([10.213.179.11]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2022 11:05:56 -0700 From: ira.weiny@intel.com To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Cc: x86@kernel.org, Ira Weiny , linux-kernel@vger.kernel.org Subject: [RESEND PATCH] x86/pkeys: Clean up arch_set_user_pkey_access() declaration Date: Thu, 31 Mar 2022 11:05:54 -0700 Message-Id: <20220331180554.2945884-1-ira.weiny@intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny arch_set_user_pkey_access() was declared two times in the header. Remove the 2nd declaration. Suggested-by: "Edgecombe, Rick P" Signed-off-by: Ira Weiny --- This is a resend of a patch[1] which was originally part of a larger clean up series. Dave asked that the type clean up be reworked but the first 2 patches are separate from that work and should stand on their own. Resending this patch for inclusion on it's own. [1] https://lore.kernel.org/lkml/20220311005742.1060992-2-ira.weiny@intel.com/ --- arch/x86/include/asm/pkeys.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/include/asm/pkeys.h b/arch/x86/include/asm/pkeys.h index 1d5f14aff5f6..9c530530b9a7 100644 --- a/arch/x86/include/asm/pkeys.h +++ b/arch/x86/include/asm/pkeys.h @@ -118,8 +118,6 @@ int mm_pkey_free(struct mm_struct *mm, int pkey) return 0; } -extern int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, - unsigned long init_val); extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey, unsigned long init_val); -- 2.35.1