Hi Randy,
On Fri, 3 Nov 2017 15:41:35 -0700 Randy Dunlap <rdunlap@xxxxxxxxxxxxx> wrote:
>
> On 11/03/2017 01:01 PM, akpm@xxxxxxxxxxxxxxxxxxxx wrote:
> >
> > This mmotm tree contains the following patches against 4.14-rc7:
> > (patches marked "*" will be included in linux-next)
> >
> > origin.patch
> origin.patch has a problem. When CONFIG_SMP is not enabled (on x86_64 e.g.):
>
> - if (cpu_has(c, X86_FEATURE_TSC))
> + if (cpu_has(c, X86_FEATURE_TSC)) {
> + unsigned int freq = arch_freq_get_on_cpu(cpu);
>
>
> arch/x86/kernel/cpu/proc.o: In function `show_cpuinfo':
> proc.c:(.text+0x13d): undefined reference to `arch_freq_get_on_cpu'
> /local/lnx/mmotm/mmotm-2017-1103-1300/Makefile:994: recipe for target 'vmlinux' failed
That would be because the conflist in arch/x86/kernel/cpu/Makefile has
been resolved the wrong way. In the linux-next import, I have resolved
it like this:
diff --cc arch/x86/kernel/cpu/Makefile
index 236999c54edc,90cb82dbba57..000000000000
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@@ -22,7 -22,8 +22,8 @@@ obj-y += common.
obj-y += rdrand.o
obj-y += match.o
obj-y += bugs.o
-obj-$(CONFIG_CPU_FREQ) += aperfmperf.o
+obj-y += aperfmperf.o
+ obj-y += cpuid-deps.o
obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o
so it should bo OK there on Monday. [mmotm retained the:
obj-$(CONFIG_CPU_FREQ) += aperfmperf.o
]
--
Cheers,
Stephen Rothwell
