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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 21625C4360F for ; Fri, 15 Feb 2019 18:35:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F280B206C0 for ; Fri, 15 Feb 2019 18:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390594AbfBOSfo (ORCPT ); Fri, 15 Feb 2019 13:35:44 -0500 Received: from mga05.intel.com ([192.55.52.43]:11807 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388116AbfBOSfj (ORCPT ); Fri, 15 Feb 2019 13:35:39 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Feb 2019 10:35:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,373,1544515200"; d="scan'208";a="126819648" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 15 Feb 2019 10:35:36 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id A47E8F5; Fri, 15 Feb 2019 20:35:35 +0200 (EET) From: Andy Shevchenko To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 1/2] x86/cpu: Allow INTEL_CPU_FAM_ANY() to take integers Date: Fri, 15 Feb 2019 21:35:34 +0300 Message-Id: <20190215183535.4008-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Driver data can be a plain integer and we have such users. For now they are implementing a custom macro to accept this. Let's allow them to use generic one by moving address-of operation outside of the INTEL_CPU_FAM_ANY() macro. Signed-off-by: Andy Shevchenko --- arch/x86/include/asm/intel-family.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 698d53852919..4120dfcd8891 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -87,10 +87,10 @@ .family = _family, \ .model = _model, \ .feature = X86_FEATURE_ANY, \ - .driver_data = (kernel_ulong_t)&_driver_data \ + .driver_data = (kernel_ulong_t)_driver_data \ } #define INTEL_CPU_FAM6(_model, _driver_data) \ - INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data) + INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, &_driver_data) #endif /* _ASM_X86_INTEL_FAMILY_H */ -- 2.20.1