--- 2.4.5/include/asm-i386/processor.h	Sun Jun  3 12:59:42 2001
+++ 2.4.5aa3/include/asm-i386/processor.h	Mon Jun  4 21:31:27 2001
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <asm/sigcontext.h>
 #include <asm/cpufeature.h>
+#include <linux/cache.h>
 #include <linux/config.h>
 #include <linux/threads.h>
 
@@ -52,7 +53,7 @@
 	unsigned long *pmd_quick;
 	unsigned long *pte_quick;
 	unsigned long pgtable_cache_sz;
-};
+} __attribute__((__aligned__(SMP_CACHE_BYTES)));
 
 #define X86_VENDOR_INTEL 0
 #define X86_VENDOR_CYRIX 1
--- 2.4.5/arch/i386/kernel/smpboot.c	Thu Feb 22 03:44:53 2001
+++ 2.4.5aa3/arch/i386/kernel/smpboot.c	Mon Jun  4 21:18:10 2001
@@ -66,7 +66,7 @@
 static volatile unsigned long cpu_callout_map;
 
 /* Per CPU bogomips and other parameters */
-struct cpuinfo_x86 cpu_data[NR_CPUS];
+struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned;
 
 /* Set when the idlers are all forked */
 int smp_threads_ready;