On Wed, 2003-12-17 at 12:52, Andrew Morton wrote:
And new breakage too!
quoted hunk ↗ jump to hunk
Fix:
diff -puN arch/i386/kernel/cpu/intel.c~cpu_sibling_map-fixes-fix arch/i386/kernel/cpu/intel.c
--- 25/arch/i386/kernel/cpu/intel.c~cpu_sibling_map-fixes-fix 2003-12-17 03:31:56.000000000 -0800
+++ 25-akpm/arch/i386/kernel/cpu/intel.c 2003-12-17 03:46:25.000000000 -0800
@@ -8,9 +8,11 @@
#include <asm/processor.h>
#include <asm/msr.h>
#include <asm/uaccess.h>
+#include <asm/mpspec.h>
+#include <asm/apic.h>
#include "cpu.h"
-#include "mach_apic.h"
+#include <mach_apic.h>
extern int trap_init_f00f_bug(void);
Does not apply cleanly, but this one does.