lkml.org 
[lkml]   [2003]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: 2.6.0-test11-mm1
From
Date
On Wed, 2003-12-17 at 12:52, Andrew Morton wrote:

> And new breakage too!

> 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.
diff -uNr linux-2.6.0-test11/arch/i386/kernel/cpu/intel.c linux-2.6.0-test11-mm1/arch/i386/kernel/cpu/intel.c
--- linux-2.6.0-test11/arch/i386/kernel/cpu/intel.c 2003-12-17 14:21:29.060115753 +0100
+++ linux-2.6.0-test11-mm1/arch/i386/kernel/cpu/intel.c 2003-12-17 14:10:39.886919748 +0100
@@ -9,9 +9,11 @@
#include <asm/msr.h>
#include <asm/uaccess.h>
#include <asm/desc.h>
+#include <asm/mpspec.h>
+#include <asm/apic.h>

#include "cpu.h"
-#include "mach_apic.h"
+#include <mach_apic.h>

#ifdef CONFIG_X86_INTEL_USERCOPY
/*
\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.116 / U:0.476 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site