diff -aurpN -X /home/fletch/.diff.exclude 520-lockmeter_ia64/arch/i386/kernel/cpu/intel.c 540-4g4g_sep_fix/arch/i386/kernel/cpu/intel.c
--- 520-lockmeter_ia64/arch/i386/kernel/cpu/intel.c	Fri Jan  9 21:01:58 2004
+++ 540-4g4g_sep_fix/arch/i386/kernel/cpu/intel.c	Fri Jan  9 23:09:31 2004
@@ -239,6 +239,12 @@ static void __init init_intel(struct cpu
 	/* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */
 	if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633)
 		clear_bit(X86_FEATURE_SEP, c->x86_capability);
+	/*
+	 * FIXME: SEP is disabled for 4G/4G for now:
+	 */
+#ifdef CONFIG_X86_HIGH_ENTRY
+	clear_bit(X86_FEATURE_SEP, c->x86_capability);
+#endif
 
 	/* Names for the Pentium II/Celeron processors 
 	   detectable only by also checking the cache size.