The patch titled
voyager: fix compile after setup rework
has been added to the -mm tree. Its filename is
voyager-fix-compile-after-setup-rework.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: voyager: fix compile after setup rework
From: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
The following
[PATCH] Clean up and refactor i386 sub-architecture setup
Doesn't quite work, since it leaves out an include of asm/io.h, without
which the use of inb/outb in the setup file won.t work. This corrects that
and also removes a spurious acpi reference that apparently crept in ages
ago but should never have been there.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mach-voyager/setup.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/i386/mach-voyager/setup.c~voyager-fix-compile-after-setup-rework arch/i386/mach-voyager/setup.c
--- a/arch/i386/mach-voyager/setup.c~voyager-fix-compile-after-setup-rework
+++ a/arch/i386/mach-voyager/setup.c
@@ -5,10 +5,10 @@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <asm/acpi.h>
#include <asm/arch_hooks.h>
#include <asm/voyager.h>
#include <asm/e820.h>
+#include <asm/io.h>
#include <asm/setup.h>
void __init pre_intr_init_hook(void)
@@ -27,8 +27,7 @@ void __init intr_init_hook(void)
smp_intr_init();
#endif
- if (!acpi_ioapic)
- setup_irq(2, &irq2);
+ setup_irq(2, &irq2);
}
void __init pre_setup_arch_hook(void)
_
Patches currently in -mm which might be from James.Bottomley@xxxxxxxxxxxx are
origin.patch
git-scsi-target.patch
fix-subarchitecture-breakage-with-config_sched_smt.patch
voyager-fix-compile-after-setup-rework.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
