From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06534C32789 for ; Tue, 6 Nov 2018 15:42:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1F5D2086A for ; Tue, 6 Nov 2018 15:42:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="Hy9H1OS5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1F5D2086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389200AbeKGBIP (ORCPT ); Tue, 6 Nov 2018 20:08:15 -0500 Received: from mail-eopbgr810083.outbound.protection.outlook.com ([40.107.81.83]:2492 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388422AbeKGBG7 (ORCPT ); Tue, 6 Nov 2018 20:06:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rSkVNqzTsChJS3//fCVF8HJxPA7aGblrkMrU0BiCYc0=; b=Hy9H1OS516t/93l0idJ+agY1D53kVbJxOoxBd3FKKxpXqlBOvwGYK0fp+kzLTn7KZ0Jowo0Q4m54eKXWwyJrU+gYYNtn5GErj3fdwzYr+eILfqZYaTcaiTL93GLjwr3slQZEFCPDyUg+aXUzuuZaoa/NaaxTgRtC2GkU7Bay3B8= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB1801.namprd12.prod.outlook.com (10.175.91.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Tue, 6 Nov 2018 15:41:10 +0000 Received: from DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::4c23:f551:bc6a:554e]) by DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::4c23:f551:bc6a:554e%4]) with mapi id 15.20.1294.032; Tue, 6 Nov 2018 15:41:10 +0000 From: "Moger, Babu" To: "tglx@linutronix.de" , "mingo@redhat.com" , "bp@alien8.de" , "corbet@lwn.net" , "fenghua.yu@intel.com" , "reinette.chatre@intel.com" , "peterz@infradead.org" , "gregkh@linuxfoundation.org" , "davem@davemloft.net" , "akpm@linux-foundation.org" CC: "hpa@zytor.com" , "x86@kernel.org" , "mchehab+samsung@kernel.org" , "arnd@arndb.de" , "kstewart@linuxfoundation.org" , "pombredanne@nexb.com" , "rafael@kernel.org" , "kirill.shutemov@linux.intel.com" , "tony.luck@intel.com" , "qianyue.zj@alibaba-inc.com" , "xiaochen.shen@intel.com" , "pbonzini@redhat.com" , "Singh, Brijesh" , "Hurwitz, Sherry" , "dwmw2@infradead.org" , "Lendacky, Thomas" , "luto@kernel.org" , "joro@8bytes.org" , "jannh@google.com" , "vkuznets@redhat.com" , "rian@alum.mit.edu" , "jpoimboe@redhat.com" , "Moger, Babu" , "linux-kernel@vger.kernel.org" , "linux-doc@vger.kernel.org" Subject: [PATCH v6 06/14] arch/x86: Use new config parameter RESCTRL for compilation Thread-Topic: [PATCH v6 06/14] arch/x86: Use new config parameter RESCTRL for compilation Thread-Index: AQHUdeckiBCv29Msj0WRJOHW2fLqew== Date: Tue, 6 Nov 2018 15:41:10 +0000 Message-ID: <20181106154034.15386-7-babu.moger@amd.com> References: <20181106154034.15386-1-babu.moger@amd.com> In-Reply-To: <20181106154034.15386-1-babu.moger@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN4PR0401CA0010.namprd04.prod.outlook.com (2603:10b6:803:21::20) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [165.204.78.1] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR12MB1801;20:cv12DK/DJQSiszVnm4Vz7d7zvk9hzXnebYXruQ/5V/CUyFzYTj8SdFWm9R9PE9LUJHyMoGI9J55YRDgKDa3IhqWK9EB91xJGkCp3iZKUDjrfohrKkVL/AXjkuwF/TOpk1616My9GuJxyLS3fh4fEBExAXOZxXyvXzOQx2WIEFcfL5D4MXFoq7TN+LTwcDLkROpD3v7XzHP08i6b8dy2EO/1UPX2beoIpdIa39skdSQv2oOmB6Op8noFWRaH5Qakr x-ms-office365-filtering-correlation-id: 14c76906-b650-439e-d02d-08d643fe4692 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:DM5PR12MB1801; x-ms-traffictypediagnostic: DM5PR12MB1801: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(767451399110); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823302103)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095);SRVR:DM5PR12MB1801;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1801; x-forefront-prvs: 0848C1A6AA x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(136003)(346002)(396003)(376002)(366004)(199004)(189003)(476003)(6512007)(486006)(53936002)(2900100001)(76176011)(52116002)(26005)(186003)(102836004)(6506007)(446003)(11346002)(99286004)(4326008)(106356001)(386003)(105586002)(3846002)(6486002)(6116002)(1076002)(68736007)(66066001)(36756003)(14454004)(8676002)(81156014)(81166006)(2616005)(8936002)(7406005)(5660300001)(6436002)(316002)(2906002)(7416002)(305945005)(7736002)(54906003)(110136005)(25786009)(72206003)(86362001)(478600001)(71190400001)(2201001)(71200400001)(2501003)(97736004)(256004)(14444005)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1801;H:DM5PR12MB2471.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: WSpMl++59Knm2hbOf37iInldDbl3mJOgV7/djWJj8S+4E2cSxqluYKB9hRKs4SIlplCCNjrzPrGRBXMqcxsY02D1AV+uLgmwRyFOzsEzUCQRkOYo0W+xlbYdwYALBJumM0CBB3LLt1r8Ithf7d26OfB6CkBiq8pb322CJTXujKT+ezpuasr3cahESoDKOtdXdzXQmPWKFv/3+cNPDSCwn+nbOA/MBhEVbwp6CvQFNPOxCTc/D8tN9LFUECE6uMvVDdBCiAkoQQDqPeoHbGrhpKVSJkGViv//Xlu7cWVak87mPYxTbpuJZXyhwm36spC/vFJ43+Hz0WanGjgV+1GOO6ihqu5gmCXI8VC4pyGGAJs= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14c76906-b650-439e-d02d-08d643fe4692 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Nov 2018 15:41:10.7336 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1801 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use newly added config parameter RESCTRL to compile sources. This is common parameter across both Intel and AMD. Signed-off-by: Babu Moger --- arch/x86/include/asm/resctrl_sched.h | 4 ++-- arch/x86/kernel/cpu/Makefile | 4 ++-- include/linux/sched.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/resctrl_sched.h b/arch/x86/include/asm/re= sctrl_sched.h index 6e082697a613..54990fe2a3ae 100644 --- a/arch/x86/include/asm/resctrl_sched.h +++ b/arch/x86/include/asm/resctrl_sched.h @@ -2,7 +2,7 @@ #ifndef _ASM_X86_RESCTRL_SCHED_H #define _ASM_X86_RESCTRL_SCHED_H =20 -#ifdef CONFIG_INTEL_RDT +#ifdef CONFIG_RESCTRL =20 #include #include @@ -88,6 +88,6 @@ static inline void resctrl_sched_in(void) =20 static inline void resctrl_sched_in(void) {} =20 -#endif /* CONFIG_INTEL_RDT */ +#endif /* CONFIG_RESCTRL */ =20 #endif /* _ASM_X86_RESCTRL_SCHED_H */ diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 222cf8cc078d..79279953c5f9 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -35,8 +35,8 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) +=3D centaur.o obj-$(CONFIG_CPU_SUP_TRANSMETA_32) +=3D transmeta.o obj-$(CONFIG_CPU_SUP_UMC_32) +=3D umc.o =20 -obj-$(CONFIG_INTEL_RDT) +=3D resctrl.o resctrl_rdtgroup.o resctrl_monitor.= o -obj-$(CONFIG_INTEL_RDT) +=3D resctrl_ctrlmondata.o resctrl_pseudo_lock.o +obj-$(CONFIG_RESCTRL) +=3D resctrl.o resctrl_rdtgroup.o resctrl_monitor.o +obj-$(CONFIG_RESCTRL) +=3D resctrl_ctrlmondata.o resctrl_pseudo_lock.o CFLAGS_resctrl_pseudo_lock.o =3D -I$(src) =20 obj-$(CONFIG_X86_MCE) +=3D mcheck/ diff --git a/include/linux/sched.h b/include/linux/sched.h index 977cb57d7bc9..c4cf94c447b2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -985,7 +985,7 @@ struct task_struct { /* cg_list protected by css_set_lock and tsk->alloc_lock: */ struct list_head cg_list; #endif -#ifdef CONFIG_INTEL_RDT +#ifdef CONFIG_RESCTRL u32 closid; u32 rmid; #endif --=20 2.17.1