Messages in this thread | | | Date | Mon, 12 Jan 2009 11:09:22 -0800 | From | Mike Travis <> | Subject | Re: [PATCH] x86: include apicnum.h in acpidef.h |
| |
Yinghai Lu wrote: > Impact: clean up > > it seems Ingo revert it wrongly. > put it back again > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> > > --- > arch/x86/include/asm/apicdef.h | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > Index: linux-2.6/arch/x86/include/asm/apicdef.h > =================================================================== > --- linux-2.6.orig/arch/x86/include/asm/apicdef.h > +++ linux-2.6/arch/x86/include/asm/apicdef.h > @@ -132,12 +132,7 @@ > #define APIC_BASE_MSR 0x800 > #define X2APIC_ENABLE (1UL << 10) > > -#ifdef CONFIG_X86_32 > -# define MAX_IO_APICS 64 > -#else > -# define MAX_IO_APICS 128 > -# define MAX_LOCAL_APIC 32768 > -#endif > +#include <asm/apicnum.h> > > /* > * All x86-64 systems are xAPIC compatible.
Hi Yinghai,
Actually, Ingo got it right. I had introduced the apicnum.h file to get around header entanglements. But as Ingo pointed out, I did the include file chain wrong, so removing the apicnum.h file seemed to be the correct thing to do. (I just haven't figured out yet how to remove a file via email patch. I was just going to clean it up next time I pushed changes to Ingo.)
Thanks, Mike
| |