Re: [git pull] scheduler warning fix

From: Ingo Molnar
Date: Sun Nov 09 2008 - 15:09:21 EST



* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

>
>
> On Sun, 9 Nov 2008, Ingo Molnar wrote:
> >
> > Please pull the latest sched-fixes-for-linus git tree from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
> >
> > Fixes a silly build warning that slipped through yesterday, sorry
> > about that.
>
> Whaa?
>
> In file included from /home/torvalds/v2.6/linux/arch/x86/include/asm/timex.h:6,
> from include/linux/timex.h:202,
> from include/linux/jiffies.h:8,
> from include/linux/ktime.h:25,
> from include/linux/timer.h:5,
> from include/linux/workqueue.h:8,
> from include/linux/slub_def.h:11,
> from include/linux/slab.h:124,
> from include/linux/percpu.h:5,
> from include/linux/rcupdate.h:39,
> from include/linux/tracepoint.h:18,
> from include/linux/module.h:19,
> from include/linux/crypto.h:21,
> from arch/x86/kernel/asm-offsets_64.c:7,
> from arch/x86/kernel/asm-offsets.c:4:
> /home/torvalds/v2.6/linux/arch/x86/include/asm/tsc.h: In function âvget_cyclesâ:
> /home/torvalds/v2.6/linux/arch/x86/include/asm/tsc.h:46: error: âcyclesâ undeclared (first use in this function)
> /home/torvalds/v2.6/linux/arch/x86/include/asm/tsc.h:46: error: (Each undeclared identifier is reported only once
> /home/torvalds/v2.6/linux/arch/x86/include/asm/tsc.h:46: error: for each function it appears in.)
> make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
> make: *** [prepare0] Error 2
>
> That makes no sense. You've apparently done some idiotic rebasing of
> a patch that needs to be applied on top of an earlier patch into a
> tree that does _not_ need it, and then send it as a pull request.
>
> What _are_ you doing?

Sigh, sorry - please disregard the pull request.

What happened is that the cleanup patch below introduced that warning
- and this morning i noticed that warning and i thought i introduced
an ugly warning upstream and did a quick fix in that branch - but it
didnt actually need any fixing (and in fact it broke the build).

So upstream is fine and doesnt need any fix.

Ingo

------------------------>