Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp2636106imm; Thu, 11 Oct 2018 13:35:50 -0700 (PDT) X-Google-Smtp-Source: ACcGV61HwLoFD8QeDHQMiCvOrDjyIHloKu6hQFJff8UWEG1WsYK6IpP7p6tCQ1WnCyDi2A7gWroE X-Received: by 2002:a17:902:15c5:: with SMTP id a5-v6mr2956292plh.137.1539290150832; Thu, 11 Oct 2018 13:35:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539290150; cv=none; d=google.com; s=arc-20160816; b=oB+OehlDWx5hzTIEKe4d6CuGkZIMw0S73ff3v5zBxk2wRZd0nyWQQof5DGyKxJTh9E JRL93k8VEadsGrPE8vRPHzbd8h/ntw8zzfFFOZj/xC46uOX0kKByCzqosgDcUa0Q6sl1 vGmevI7m9NLwhgjPoIThpskFR+NWYVs01uLaIXU3GynsT7h/Yt6jf33Zd5zAEasVe8aO beYaxBcGxp9hHCTMOUXNQPn6oDCTKv9AXY1KYBHWGOykBb7+AsKdzJTk3yHypWiex4Rl YNvTCy8HxucKZYe6PWt707Q6DTOI6z7USzXya/zu38fLTrIBHgb2JH51Zdc8wCWKKgGq HC4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=rSkVNqzTsChJS3//fCVF8HJxPA7aGblrkMrU0BiCYc0=; b=lyI9hWDB8mIDdx1i8PPaY89ojnLPhYB7EtrUEUCFCLsfuCjT49+HIzL1EFV3bkB2Sd 8DX1kulCY3L6CmE3VsDEtpPA+3aJQ3WibuHEkNmZ1z6w1KeDdKh/Td09YGNjhaNBA7Je zKmezCVYriIbI7pzEMIamfKKTmEiySbs9PxUkQtRcDcVp5DeVo4VlmCf1bXueBccPGqb I3Mh0qsXCw8xX1MqMTSBrK0znvqIOK4WDh5nXdjFg7cDh684C6oDmyzSCPQjrKAi5gro ydSy/vVpBpJa8/dfHL84ES00jJBwxIJkJupEXqkJ+qLxmd6EcOZWIy37K4hdhXsthht3 wdIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=em02HGh4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u10-v6si29217040plq.1.2018.10.11.13.35.36; Thu, 11 Oct 2018 13:35:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=em02HGh4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726810AbeJLEDC (ORCPT + 99 others); Fri, 12 Oct 2018 00:03:02 -0400 Received: from mail-bn3nam01on0087.outbound.protection.outlook.com ([104.47.33.87]:21632 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725850AbeJLEDC (ORCPT ); Fri, 12 Oct 2018 00:03:02 -0400 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=em02HGh490tXCkfOAwOn+/dWMVTcdeEGPXL4/vMzIm8DCMyLlC8l8Cfr3aGb8hZ5wqbSbALXOfjYreiJ3nk2BWlN/V8uYrZYGHbeDey4hFVHVLMli8JowN6s4vU52rFsl2HVTXOxBlh0Xo8NC4HSRejI44+AgW5/hRQ22uRy4lQ= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB1211.namprd12.prod.outlook.com (10.168.237.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.24; Thu, 11 Oct 2018 20:33:24 +0000 Received: from DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::bd60:9d30:b818:b828]) by DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::bd60:9d30:b818:b828%3]) with mapi id 15.20.1228.020; Thu, 11 Oct 2018 20:33:24 +0000 From: "Moger, Babu" To: "tglx@linutronix.de" , "mingo@redhat.com" , "hpa@zytor.com" , "reinette.chatre@intel.com" , "fenghua.yu@intel.com" , "james.morse@arm.com" , "vikas.shivappa@linux.intel.com" , "tony.luck@intel.com" CC: "x86@kernel.org" , "peterz@infradead.org" , "Moger, Babu" , "pombredanne@nexb.com" , "gregkh@linuxfoundation.org" , "kstewart@linuxfoundation.org" , "bp@suse.de" , "rafael.j.wysocki@intel.com" , "ak@linux.intel.com" , "kirill.shutemov@linux.intel.com" , "xiaochen.shen@intel.com" , "colin.king@canonical.com" , "Hurwitz, Sherry" , "Lendacky, Thomas" , "pbonzini@redhat.com" , "dwmw@amazon.co.uk" , "luto@kernel.org" , "jroedel@suse.de" , "jannh@google.com" , "dima@arista.com" , "jpoimboe@redhat.com" , "vkuznets@redhat.com" , "linux-kernel@vger.kernel.org" Subject: [PATCH v3 06/11] arch/x86: Use new config parameter RESCTRL for compilation Thread-Topic: [PATCH v3 06/11] arch/x86: Use new config parameter RESCTRL for compilation Thread-Index: AQHUYaGoD0orSaS1ekK+X4gdcgflfg== Date: Thu, 11 Oct 2018 20:33:23 +0000 Message-ID: <20181011203223.18157-7-babu.moger@amd.com> References: <20181011203223.18157-1-babu.moger@amd.com> In-Reply-To: <20181011203223.18157-1-babu.moger@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MWHPR22CA0062.namprd22.prod.outlook.com (2603:10b6:300:12a::24) 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;DM5PR12MB1211;20:ocltHmP6pZWJ2GL17FSqNO+P3UKQxo4OJPYXIFncs94smSs6O9EBXQiR6b3Yy4PnHVRDmTEuDGWu9JFOPziWsfFtV6a8fdFrx0mDFuic1pHkbEvb0POmkxgS69zHuEuS4JLEkZnaodPENs5sd1i1LUkFJ/GZh5u7R1evx9MJELPhYebUwg6EqqCPzVtLQ/cVbokUFNQZg5S5hg5Qa4SWib40i6ZB2miv8NR1mSvw1CWRVNbvcq0B4URMP9US+A2H x-ms-office365-filtering-correlation-id: cf2d56e1-4bf3-4664-025e-08d62fb8ca76 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:DM5PR12MB1211; x-ms-traffictypediagnostic: DM5PR12MB1211: 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)(8121501046)(5005006)(823302103)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051)(76991062);SRVR:DM5PR12MB1211;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1211; x-forefront-prvs: 08220FA8D6 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(366004)(346002)(396003)(39860400002)(199004)(189003)(316002)(2900100001)(71200400001)(71190400001)(14454004)(97736004)(86362001)(2501003)(5250100002)(105586002)(6512007)(6486002)(106356001)(36756003)(6436002)(478600001)(72206003)(5660300001)(102836004)(476003)(486006)(186003)(2616005)(446003)(11346002)(7736002)(305945005)(7416002)(81166006)(14444005)(53936002)(68736007)(8676002)(81156014)(66066001)(386003)(52116002)(256004)(4326008)(8936002)(99286004)(6506007)(2201001)(110136005)(3846002)(6116002)(26005)(76176011)(1076002)(54906003)(25786009)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1211;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: M2iueBdgS37GoTfTMWHm81D+9o3hRzhrGhVxHTYN2QOI2T7oSnO48wTDEY8s331Q+l4+1kMKW4Y+pw5VvIH2zR9Or5l4zvTH1dZRS8qgVytLPXsv/wqlzZSo/Pa9VR3xaD3qXBQK3FjJ9fdCsm3rB5x/PE52sPeUHQ6bxHd9ouBA3tYBsYXqI6Z/BfT7AsS0xO5FOpicWfLtqOUaPE3sMWBibtHXuWt12Ws2ai1A6M1MtrVWlApt38jL0ZuYq300dtBQ+6s4IqshCLJkSQE8syn333Ra0AfFZYeUOsLZ/rdC++ewv2XqZerREko9UA5EkckQyH+CrXH5nAf5GyJbk2e+UOy77y5fwuSS94P2yW0= 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: cf2d56e1-4bf3-4664-025e-08d62fb8ca76 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2018 20:33:24.0095 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1211 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