From: Felipe Alfaro Solana <felipe_alfaro@linuxmail.org>
To: Andrew Morton <akpm@osdl.org>
Cc: Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>,
linux-mm@kvack.org
Subject: Re: 2.6.0-test11-mm1
Date: Wed, 17 Dec 2003 14:30:14 +0100 [thread overview]
Message-ID: <1071667814.2588.0.camel@teapot.felipe-alfaro.com> (raw)
In-Reply-To: <20031217035246.32adbf87.akpm@osdl.org>
[-- Attachment #1: Type: text/plain, Size: 681 bytes --]
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.
[-- Attachment #2: intel.c~cpu_sibling_map-fixes-fix --]
[-- Type: text/x-patch, Size: 534 bytes --]
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
/*
next prev parent reply other threads:[~2003-12-17 13:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-12-17 9:43 2.6.0-test11-mm1 Andrew Morton
2003-12-17 11:52 ` 2.6.0-test11-mm1 Andrew Morton
2003-12-17 13:30 ` Felipe Alfaro Solana [this message]
2003-12-17 13:56 ` 2.6.0-test11-mm1 Zwane Mwaikambo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1071667814.2588.0.camel@teapot.felipe-alfaro.com \
--to=felipe_alfaro@linuxmail.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox