Build Broken for 2.6.0-test3-bk8

PATCH In review Emilio Jesús Gallego Arias 2 participants 2 messages Aug 20, 2003

lore

Share & tools

lore

Emilio Jesús Gallego Arias

author

2003-08-20 20:22 UTC #0 lore raw

PATCH 1/1 Build Broken for 2.6.0-test3-bk8

I got the same error, and applied this patch. Don't know if it's the way to go:

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:

#                  ChangeSet    1.1279  -> 1.1280
#       arch/i386/kernel/setup.c        1.92    -> 1.93
#       arch/i386/kernel/acpi/boot.c    1.27    -> 1.28

#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/08/20 emilio@ellugar.(none) 1.1280
# - Fix build error due a missing include.
# --------------------------------------------
#

arch/i386/kernel/acpi/boot.c Wed Aug 20 22:18:04 2003 +1 -0

diff -Nru a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
@@ -34,6 +34,7 @@
 #if defined (CONFIG_X86_LOCAL_APIC)
 #include <mach_apic.h>
 #include <mach_mpparse.h>
+#include <asm/io_apic.h>
 #endif
  
 #define PREFIX                 "ACPI: "

arch/i386/kernel/setup.c Wed Aug 20 22:18:04 2003 +1 -0

diff -Nru a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
@@ -43,6 +43,7 @@
 #include <asm/setup.h>
 #include <asm/arch_hooks.h>
 #include <asm/sections.h>
+#include <asm/io_apic.h>
 #include "setup_arch_pre.h"
 #include "mach_resources.h"

Alex Goddard

2003-08-20 22:36 UTC #1 lore raw

Quoted 33 lines · On Wed, 20 Aug 2003, Emilio [ISO-8859-1] Jes�s Gallego Arias wrote:

I got the same error, and applied this patch. Don't know if it's the way to go:
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#                  ChangeSet    1.1279  -> 1.1280
#       arch/i386/kernel/setup.c        1.92    -> 1.93
#       arch/i386/kernel/acpi/boot.c    1.27    -> 1.28
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/08/20 emilio@ellugar.(none) 1.1280
# - Fix build error due a missing include.
# --------------------------------------------
#
diff -Nru a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
arch/i386/kernel/acpi/boot.c Wed Aug 20 22:18:04 2003 +1 -0
@@ -34,6 +34,7 @@
 #if defined (CONFIG_X86_LOCAL_APIC)
 #include <mach_apic.h>
 #include <mach_mpparse.h>
+#include <asm/io_apic.h>
 #endif
 
 #define PREFIX                 "ACPI: "
diff -Nru a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c

arch/i386/kernel/setup.c Wed Aug 20 22:18:04 2003 line 48

Quoted 6 lines

arch/i386/kernel/setup.c Wed Aug 20 22:18:04 2003 +1 -0

@@ -43,6 +43,7 @@
 #include <asm/setup.h>
 #include <asm/arch_hooks.h>
 #include <asm/sections.h>
+#include <asm/io_apic.h>
 #include "setup_arch_pre.h"
 #include "mach_resources.h"

I'd already tried this (see my second post to the other thread). This only works if you've got APIC enabled. I don't feel like mucking around in the library and moving the extern int skip_ioapic_setup out of the proper ifdef (which is I think what's going on. That variable gets ifdef'd out without APIC enabled, I think).

Signature · 2 lines

Alex Goddard
agoddard at purdue.edu