2007-05-22 23:47:53

by Sven-Thorsten Dietrich

[permalink] [raw]
Subject: [PATCH] 2.6.21-rt6 genapic


Add declaration for setup_apic_routing

This duplicates the declaration from i386 to x86_64 in the header.

The code, in genapic.c is shared between i386/x86_64.

Steven was trying to clean up that mess a while back, and this adds to
it.

In any case this gets compiling with
-Werror-implicit-function-declaration

Sven

Index: linux-2.6.21/arch/i386/kernel/acpi/boot.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/acpi/boot.c
+++ linux-2.6.21/arch/i386/kernel/acpi/boot.c
@@ -35,6 +35,7 @@
#include <linux/ioport.h>

#include <asm/pgtable.h>
+#include <asm/genapic.h>
#include <asm/io_apic.h>
#include <asm/apic.h>
#include <asm/io.h>
Index: linux-2.6.21/arch/x86_64/kernel/mpparse.c
===================================================================
--- linux-2.6.21.orig/arch/x86_64/kernel/mpparse.c
+++ linux-2.6.21/arch/x86_64/kernel/mpparse.c
@@ -30,6 +30,7 @@
#include <asm/io_apic.h>
#include <asm/proto.h>
#include <asm/acpi.h>
+#include <asm/genapic.h>

/* Have we found an MP table */
int smp_found_config;
Index: linux-2.6.21/include/asm-x86_64/genapic.h
===================================================================
--- linux-2.6.21.orig/include/asm-x86_64/genapic.h
+++ linux-2.6.21/include/asm-x86_64/genapic.h
@@ -29,6 +29,7 @@ struct genapic {
unsigned int (*phys_pkg_id)(int index_msb);
};

+void setup_apic_routing(void);

extern struct genapic *genapic;