Re: "Read my lips: no more merges" - aka Linux 2.6.14-rc1

Horst von Brand
2005-09-13T21:32:30Z

After the big "no more merges" push of stuff into 2.6.14-rc1 on i686 I get:

arch/i386/kernel/built-in.o: In function `parse_cmdline_early':
: undefined reference to `disable_timer_pin_1'
arch/i386/kernel/built-in.o: In function `parse_cmdline_early':
: undefined reference to `disable_timer_pin_1'
arch/i386/kernel/built-in.o: In function `parse_cmdline_early':
: undefined reference to `disable_timer_pin_1'

In io_apic.c there is an:

int disable_timer_pin_1 __initdata;

but that file isn't compiled here, as CONFIG_X86_IO_APIC isn't set; while
the pieces that reference this are protected by CONFIG_X86_LOCAL_APIC. An
option changed name, perhaps?
--
Dr. Horst H. von Brand User #22616 counter.li.org
Departamento de Informatica Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria +56 32 654239
Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513