Re: linux-next: build failure after merge of the pm tree

Rafael J. Wysocki
2015-04-13T11:42:13Z

On Monday, April 13, 2015 02:24:42 PM Stephen Rothwell wrote:
>
> --Sig_/wQd_Ak5TvD_LSZFUNsW5WJr
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from arch/x86/include/asm/msr.h:131:0,
> from arch/x86/include/asm/processor.h:20,
> from arch/x86/include/asm/thread_info.h:23,
> from include/linux/thread_info.h:54,
> from arch/x86/include/asm/preempt.h:6,
> from include/linux/preempt.h:18,
> from include/linux/smp.h:55,
> from include/linux/kernel_stat.h:4,
> from drivers/cpufreq/intel_pstate.c:14:
> drivers/cpufreq/intel_pstate.c: In function 'knl_get_turbo_pstate':
> drivers/cpufreq/intel_pstate.c:622:9: error: 'MSR_NHM_TURBO_RATIO_LIMIT' un=
> declared (first use in this function)
> rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);
> ^
> arch/x86/include/asm/paravirt.h:153:26: note: in definition of macro 'rdmsr=
> l'
> val =3D paravirt_read_msr(msr, &_err); \
> ^
> drivers/cpufreq/intel_pstate.c:622:9: note: each undeclared identifier is r=
> eported only once for each function it appears in
> rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);
> ^
> arch/x86/include/asm/paravirt.h:153:26: note: in definition of macro 'rdmsr=
> l'
> val =3D paravirt_read_msr(msr, &_err); \
> ^
>
> Caused by commit 6acfd09a439a ("tools/power turbostat: define and dump
> MSR_TURBO_RATIO_LIMIT2") interacting with commit b34ef932d79a
> ("intel_pstate: Knights Landing support"). This should have been
> resolved in commit 08fb40f3fbeb ("Merge branches 'powercap' and
> 'pm-tools'").

Right, will fix.

Thanks and sorry for the breakage.

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.