From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: akpm@linux-foundation.org, mm-commits@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org, linux-next@vger.kernel.org,
mhocko@suse.cz, broonie@kernel.org, X86 ML <x86@kernel.org>
Subject: Re: mmotm 2017-11-03-13-00 uploaded
Date: Sun, 5 Nov 2017 08:17:00 +1100 [thread overview]
Message-ID: <20171105081700.50e04162@canb.auug.org.au> (raw)
In-Reply-To: <7137ff17-e194-2896-f471-91395b447f59@infradead.org>
Hi Randy,
On Fri, 3 Nov 2017 15:41:35 -0700 Randy Dunlap <rdunlap@infradead.org> wrote:
>
> On 11/03/2017 01:01 PM, akpm@linux-foundation.org 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
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: akpm@linux-foundation.org, mm-commits@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org, linux-next@vger.kernel.org,
mhocko@suse.cz, broonie@kernel.org, X86 ML <x86@kernel.org>
Subject: Re: mmotm 2017-11-03-13-00 uploaded
Date: Sun, 5 Nov 2017 08:17:00 +1100 [thread overview]
Message-ID: <20171105081700.50e04162@canb.auug.org.au> (raw)
In-Reply-To: <7137ff17-e194-2896-f471-91395b447f59@infradead.org>
Hi Randy,
On Fri, 3 Nov 2017 15:41:35 -0700 Randy Dunlap <rdunlap@infradead.org> wrote:
>
> On 11/03/2017 01:01 PM, akpm@linux-foundation.org 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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-11-04 21:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-03 20:01 mmotm 2017-11-03-13-00 uploaded akpm
2017-11-03 20:01 ` akpm
2017-11-03 22:41 ` Randy Dunlap
2017-11-03 22:41 ` Randy Dunlap
2017-11-04 21:17 ` Stephen Rothwell [this message]
2017-11-04 21:17 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-11-03 20:01 akpm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171105081700.50e04162@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.