* [tip: x86/cpu] x86/cpu/intel: Fix rename fallout
@ 2019-08-26 11:46 tip-bot2 for Ingo Molnar
2019-08-27 2:00 ` kbuild test robot
2019-08-27 3:07 ` kbuild test robot
0 siblings, 2 replies; 3+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2019-08-26 11:46 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ingo Molnar, Peter Zijlstra (Intel), Borislav Petkov, Dave Hansen,
Linus Torvalds, Thomas Gleixner, Tony Luck, linux-kernel
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 26ee9ccc117b9c4179f0a1c65c67f71a0a5a0afe
Gitweb: https://git.kernel.org/tip/26ee9ccc117b9c4179f0a1c65c67f71a0a5a0afe
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Mon, 26 Aug 2019 12:19:06 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Mon, 26 Aug 2019 13:06:29 +02:00
x86/cpu/intel: Fix rename fallout
The scripts missed a macro construct of intel_idle.c and other files.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/idle/intel_idle.c | 26 +++++++--------
drivers/platform/x86/intel_pmc_core.c | 12 +++----
drivers/platform/x86/intel_pmc_core_pltdrv.c | 12 +++----
drivers/powercap/intel_rapl_common.c | 32 +++++++++----------
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index ac58487..347b08b 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -1072,26 +1072,26 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
INTEL_CPU_FAM6(ATOM_AIRMONT, idle_cpu_cht),
INTEL_CPU_FAM6(IVYBRIDGE, idle_cpu_ivb),
INTEL_CPU_FAM6(IVYBRIDGE_X, idle_cpu_ivt),
- INTEL_CPU_FAM6(HASWELL_CORE, idle_cpu_hsw),
+ INTEL_CPU_FAM6(HASWELL, idle_cpu_hsw),
INTEL_CPU_FAM6(HASWELL_X, idle_cpu_hsw),
- INTEL_CPU_FAM6(HASWELL_ULT, idle_cpu_hsw),
- INTEL_CPU_FAM6(HASWELL_GT3E, idle_cpu_hsw),
- INTEL_CPU_FAM6(ATOM_SILVERMONT_X, idle_cpu_avn),
- INTEL_CPU_FAM6(BROADWELL_CORE, idle_cpu_bdw),
- INTEL_CPU_FAM6(BROADWELL_GT3E, idle_cpu_bdw),
+ INTEL_CPU_FAM6(HASWELL_L, idle_cpu_hsw),
+ INTEL_CPU_FAM6(HASWELL_G, idle_cpu_hsw),
+ INTEL_CPU_FAM6(ATOM_SILVERMONT_D, idle_cpu_avn),
+ INTEL_CPU_FAM6(BROADWELL, idle_cpu_bdw),
+ INTEL_CPU_FAM6(BROADWELL_G, idle_cpu_bdw),
INTEL_CPU_FAM6(BROADWELL_X, idle_cpu_bdw),
- INTEL_CPU_FAM6(BROADWELL_XEON_D, idle_cpu_bdw),
- INTEL_CPU_FAM6(SKYLAKE_MOBILE, idle_cpu_skl),
- INTEL_CPU_FAM6(SKYLAKE_DESKTOP, idle_cpu_skl),
- INTEL_CPU_FAM6(KABYLAKE_MOBILE, idle_cpu_skl),
- INTEL_CPU_FAM6(KABYLAKE_DESKTOP, idle_cpu_skl),
+ INTEL_CPU_FAM6(BROADWELL_D, idle_cpu_bdw),
+ INTEL_CPU_FAM6(SKYLAKE_L, idle_cpu_skl),
+ INTEL_CPU_FAM6(SKYLAKE, idle_cpu_skl),
+ INTEL_CPU_FAM6(KABYLAKE_L, idle_cpu_skl),
+ INTEL_CPU_FAM6(KABYLAKE, idle_cpu_skl),
INTEL_CPU_FAM6(SKYLAKE_X, idle_cpu_skx),
INTEL_CPU_FAM6(XEON_PHI_KNL, idle_cpu_knl),
INTEL_CPU_FAM6(XEON_PHI_KNM, idle_cpu_knl),
INTEL_CPU_FAM6(ATOM_GOLDMONT, idle_cpu_bxt),
INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, idle_cpu_bxt),
- INTEL_CPU_FAM6(ATOM_GOLDMONT_X, idle_cpu_dnv),
- INTEL_CPU_FAM6(ATOM_TREMONT_X, idle_cpu_dnv),
+ INTEL_CPU_FAM6(ATOM_GOLDMONT_D, idle_cpu_dnv),
+ INTEL_CPU_FAM6(ATOM_TREMONT_D, idle_cpu_dnv),
{}
};
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index c510d0d..fd1bfd5 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -806,12 +806,12 @@ static inline void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev)
#endif /* CONFIG_DEBUG_FS */
static const struct x86_cpu_id intel_pmc_core_ids[] = {
- INTEL_CPU_FAM6(SKYLAKE_MOBILE, spt_reg_map),
- INTEL_CPU_FAM6(SKYLAKE_DESKTOP, spt_reg_map),
- INTEL_CPU_FAM6(KABYLAKE_MOBILE, spt_reg_map),
- INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map),
- INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map),
- INTEL_CPU_FAM6(ICELAKE_MOBILE, icl_reg_map),
+ INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
+ INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
+ INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
+ INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
+ INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
+ INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),
{}
};
diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel_pmc_core_pltdrv.c
index a8754a6..5977e0d 100644
--- a/drivers/platform/x86/intel_pmc_core_pltdrv.c
+++ b/drivers/platform/x86/intel_pmc_core_pltdrv.c
@@ -30,12 +30,12 @@ static struct platform_device pmc_core_device = {
* other list may grow, but this list should not.
*/
static const struct x86_cpu_id intel_pmc_core_platform_ids[] = {
- INTEL_CPU_FAM6(SKYLAKE_MOBILE, pmc_core_device),
- INTEL_CPU_FAM6(SKYLAKE_DESKTOP, pmc_core_device),
- INTEL_CPU_FAM6(KABYLAKE_MOBILE, pmc_core_device),
- INTEL_CPU_FAM6(KABYLAKE_DESKTOP, pmc_core_device),
- INTEL_CPU_FAM6(CANNONLAKE_MOBILE, pmc_core_device),
- INTEL_CPU_FAM6(ICELAKE_MOBILE, pmc_core_device),
+ INTEL_CPU_FAM6(SKYLAKE_L, pmc_core_device),
+ INTEL_CPU_FAM6(SKYLAKE, pmc_core_device),
+ INTEL_CPU_FAM6(KABYLAKE_L, pmc_core_device),
+ INTEL_CPU_FAM6(KABYLAKE, pmc_core_device),
+ INTEL_CPU_FAM6(CANNONLAKE_L, pmc_core_device),
+ INTEL_CPU_FAM6(ICELAKE_L, pmc_core_device),
{}
};
MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids);
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 6df4818..94ddd7d 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -957,27 +957,27 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
INTEL_CPU_FAM6(IVYBRIDGE, rapl_defaults_core),
INTEL_CPU_FAM6(IVYBRIDGE_X, rapl_defaults_core),
- INTEL_CPU_FAM6(HASWELL_CORE, rapl_defaults_core),
- INTEL_CPU_FAM6(HASWELL_ULT, rapl_defaults_core),
- INTEL_CPU_FAM6(HASWELL_GT3E, rapl_defaults_core),
+ INTEL_CPU_FAM6(HASWELL, rapl_defaults_core),
+ INTEL_CPU_FAM6(HASWELL_L, rapl_defaults_core),
+ INTEL_CPU_FAM6(HASWELL_G, rapl_defaults_core),
INTEL_CPU_FAM6(HASWELL_X, rapl_defaults_hsw_server),
- INTEL_CPU_FAM6(BROADWELL_CORE, rapl_defaults_core),
- INTEL_CPU_FAM6(BROADWELL_GT3E, rapl_defaults_core),
- INTEL_CPU_FAM6(BROADWELL_XEON_D, rapl_defaults_core),
+ INTEL_CPU_FAM6(BROADWELL, rapl_defaults_core),
+ INTEL_CPU_FAM6(BROADWELL_G, rapl_defaults_core),
+ INTEL_CPU_FAM6(BROADWELL_D, rapl_defaults_core),
INTEL_CPU_FAM6(BROADWELL_X, rapl_defaults_hsw_server),
- INTEL_CPU_FAM6(SKYLAKE_DESKTOP, rapl_defaults_core),
- INTEL_CPU_FAM6(SKYLAKE_MOBILE, rapl_defaults_core),
+ INTEL_CPU_FAM6(SKYLAKE, rapl_defaults_core),
+ INTEL_CPU_FAM6(SKYLAKE_L, rapl_defaults_core),
INTEL_CPU_FAM6(SKYLAKE_X, rapl_defaults_hsw_server),
- INTEL_CPU_FAM6(KABYLAKE_MOBILE, rapl_defaults_core),
- INTEL_CPU_FAM6(KABYLAKE_DESKTOP, rapl_defaults_core),
- INTEL_CPU_FAM6(CANNONLAKE_MOBILE, rapl_defaults_core),
- INTEL_CPU_FAM6(ICELAKE_MOBILE, rapl_defaults_core),
- INTEL_CPU_FAM6(ICELAKE_DESKTOP, rapl_defaults_core),
+ INTEL_CPU_FAM6(KABYLAKE_L, rapl_defaults_core),
+ INTEL_CPU_FAM6(KABYLAKE, rapl_defaults_core),
+ INTEL_CPU_FAM6(CANNONLAKE_L, rapl_defaults_core),
+ INTEL_CPU_FAM6(ICELAKE_L, rapl_defaults_core),
+ INTEL_CPU_FAM6(ICELAKE, rapl_defaults_core),
INTEL_CPU_FAM6(ICELAKE_NNPI, rapl_defaults_core),
INTEL_CPU_FAM6(ICELAKE_X, rapl_defaults_hsw_server),
- INTEL_CPU_FAM6(ICELAKE_XEON_D, rapl_defaults_hsw_server),
+ INTEL_CPU_FAM6(ICELAKE_D, rapl_defaults_hsw_server),
INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt),
INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),
@@ -985,8 +985,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
INTEL_CPU_FAM6(ATOM_AIRMONT_MID, rapl_defaults_ann),
INTEL_CPU_FAM6(ATOM_GOLDMONT, rapl_defaults_core),
INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, rapl_defaults_core),
- INTEL_CPU_FAM6(ATOM_GOLDMONT_X, rapl_defaults_core),
- INTEL_CPU_FAM6(ATOM_TREMONT_X, rapl_defaults_core),
+ INTEL_CPU_FAM6(ATOM_GOLDMONT_D, rapl_defaults_core),
+ INTEL_CPU_FAM6(ATOM_TREMONT_D, rapl_defaults_core),
INTEL_CPU_FAM6(XEON_PHI_KNL, rapl_defaults_hsw_server),
INTEL_CPU_FAM6(XEON_PHI_KNM, rapl_defaults_hsw_server),
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [tip: x86/cpu] x86/cpu/intel: Fix rename fallout
2019-08-26 11:46 [tip: x86/cpu] x86/cpu/intel: Fix rename fallout tip-bot2 for Ingo Molnar
@ 2019-08-27 2:00 ` kbuild test robot
2019-08-27 3:07 ` kbuild test robot
1 sibling, 0 replies; 3+ messages in thread
From: kbuild test robot @ 2019-08-27 2:00 UTC (permalink / raw)
To: tip-bot2 for Ingo Molnar
Cc: kbuild-all, linux-tip-commits, Ingo Molnar,
Peter Zijlstra (Intel), Borislav Petkov, Dave Hansen,
Linus Torvalds, Thomas Gleixner, Tony Luck, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 15628 bytes --]
Hi tip-bot2,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc6 next-20190826]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/tip-bot2-for-Ingo-Molnar/x86-cpu-intel-Fix-rename-fallout/20190827-083739
config: x86_64-lkp (attached as .config)
compiler: gcc-7 (Debian 7.4.0-10) 7.4.0
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from drivers/idle/intel_idle.c:53:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1075:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL, idle_cpu_hsw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_L' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1077:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_L, idle_cpu_hsw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_G' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1078:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_G, idle_cpu_hsw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_SILVERMONT_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_ATOM_SILVERMONT_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1079:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_SILVERMONT_D, idle_cpu_avn),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1080:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL, idle_cpu_bdw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_G' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1081:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_G, idle_cpu_bdw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_G'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1083:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_D, idle_cpu_bdw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1084:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1085:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1086:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function); did you mean 'INTEL_FAM6_KABYLAKE_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1087:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_GOLDMONT_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_ATOM_GOLDMONT_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1093:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_GOLDMONT_D, idle_cpu_dnv),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_TREMONT_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_ATOM_TREMONT_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers/idle/intel_idle.c:1094:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_TREMONT_D, idle_cpu_dnv),
^~~~~~~~~~~~~~
--
In file included from drivers//idle/intel_idle.c:53:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1075:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL, idle_cpu_hsw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_L' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1077:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_L, idle_cpu_hsw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_G' undeclared here (not in a function); did you mean 'INTEL_FAM6_HASWELL_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1078:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_G, idle_cpu_hsw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_SILVERMONT_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_ATOM_SILVERMONT_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1079:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_SILVERMONT_D, idle_cpu_avn),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1080:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL, idle_cpu_bdw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_G' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1081:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_G, idle_cpu_bdw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_BROADWELL_G'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1083:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_D, idle_cpu_bdw),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1084:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1085:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function); did you mean 'INTEL_FAM6_SKYLAKE_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1086:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function); did you mean 'INTEL_FAM6_KABYLAKE_L'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1087:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, idle_cpu_skl),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_GOLDMONT_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_ATOM_GOLDMONT_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1093:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_GOLDMONT_D, idle_cpu_dnv),
^~~~~~~~~~~~~~
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_TREMONT_D' undeclared here (not in a function); did you mean 'INTEL_FAM6_ATOM_TREMONT_X'?
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^~~~~~
drivers//idle/intel_idle.c:1094:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_TREMONT_D, idle_cpu_dnv),
^~~~~~~~~~~~~~
vim +114 arch/x86/include/asm/intel-family.h
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 112
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 113 #define INTEL_CPU_FAM6(_model, _driver_data) \
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 @114 INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 115
:::::: The code at line 114 was first introduced by commit
:::::: e2ce67b2b34b6e9d77da2f375dba5b525508f7df x86/cpu: Introduce INTEL_CPU_FAM*() helper macros
:::::: TO: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
:::::: CC: Thomas Gleixner <tglx@linutronix.de>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 27705 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [tip: x86/cpu] x86/cpu/intel: Fix rename fallout
2019-08-26 11:46 [tip: x86/cpu] x86/cpu/intel: Fix rename fallout tip-bot2 for Ingo Molnar
2019-08-27 2:00 ` kbuild test robot
@ 2019-08-27 3:07 ` kbuild test robot
1 sibling, 0 replies; 3+ messages in thread
From: kbuild test robot @ 2019-08-27 3:07 UTC (permalink / raw)
To: tip-bot2 for Ingo Molnar
Cc: kbuild-all, linux-tip-commits, Ingo Molnar,
Peter Zijlstra (Intel), Borislav Petkov, Dave Hansen,
Linus Torvalds, Thomas Gleixner, Tony Luck, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 18600 bytes --]
Hi tip-bot2,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc6 next-20190826]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/tip-bot2-for-Ingo-Molnar/x86-cpu-intel-Fix-rename-fallout/20190827-083739
config: x86_64-randconfig-s2-08250055 (attached as .config)
compiler: gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from drivers/platform/x86/intel_pmc_core.c:27:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:809:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:810:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:811:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:812:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:813:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:814:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
^
--
In file included from drivers/platform/x86/intel_pmc_core_pltdrv.c:19:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:33:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:34:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:35:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:36:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:37:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:38:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, pmc_core_device),
^
--
In file included from drivers/powercap/intel_rapl_common.c:27:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:960:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:961:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_G' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:962:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_G, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:965:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_G' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:966:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_G, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:967:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_D, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:970:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:971:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:973:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:974:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:975:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:976:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:977:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:980:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_D, rapl_defaults_hsw_server),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_GOLDMONT_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:988:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_GOLDMONT_D, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_TREMONT_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:989:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_TREMONT_D, rapl_defaults_core),
^
--
In file included from drivers//platform/x86/intel_pmc_core.c:27:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:809:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:810:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:811:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:812:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:813:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:814:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
^
..
vim +/INTEL_FAM6_SKYLAKE_L +114 arch/x86/include/asm/intel-family.h
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 112
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 113 #define INTEL_CPU_FAM6(_model, _driver_data) \
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 @114 INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 115
:::::: The code at line 114 was first introduced by commit
:::::: e2ce67b2b34b6e9d77da2f375dba5b525508f7df x86/cpu: Introduce INTEL_CPU_FAM*() helper macros
:::::: TO: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
:::::: CC: Thomas Gleixner <tglx@linutronix.de>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 32628 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-27 3:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-26 11:46 [tip: x86/cpu] x86/cpu/intel: Fix rename fallout tip-bot2 for Ingo Molnar
2019-08-27 2:00 ` kbuild test robot
2019-08-27 3:07 ` kbuild test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox