The patch titled
x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy
has been added to the -mm tree. Its filename is
x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm@xxxxxxxx>
extern declarations should never be placed in .c files.
Cc: Andi Kleen <ak@xxxxxx>
Cc: "Brown, Len" <len.brown@xxxxxxxxx>
Cc: "Protasevich, Natalie" <Natalie.Protasevich@xxxxxxxxxx>
Cc: Rohit Seth <rohitseth@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/io_apic.c | 3 +--
arch/i386/kernel/mpparse.c | 1 -
arch/x86_64/kernel/io_apic.c | 3 +--
arch/x86_64/kernel/mpparse.c | 1 -
include/asm-i386/apic.h | 1 +
include/asm-x86_64/apic.h | 1 +
6 files changed, 4 insertions(+), 6 deletions(-)
diff -puN arch/i386/kernel/io_apic.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy arch/i386/kernel/io_apic.c
--- devel/arch/i386/kernel/io_apic.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy 2006-04-20 16:38:09.000000000 -0700
+++ devel-akpm/arch/i386/kernel/io_apic.c 2006-04-20 16:38:09.000000000 -0700
@@ -66,6 +66,7 @@ int sis_apic_bug = -1;
int nr_ioapic_registers[MAX_IO_APICS];
int disable_timer_pin_1 __initdata;
+int timer_uses_ioapic_pin_0;
/*
* Rough estimation of how many shared IRQs there are, can
@@ -2239,8 +2240,6 @@ static inline void unlock_ExtINT_logic(v
spin_unlock_irqrestore(&ioapic_lock, flags);
}
-int timer_uses_ioapic_pin_0;
-
/*
* This code may look a bit paranoid, but it's supposed to cooperate with
* a wide range of boards and BIOS bugs. Fortunately only the timer IRQ
diff -puN arch/i386/kernel/mpparse.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy arch/i386/kernel/mpparse.c
--- devel/arch/i386/kernel/mpparse.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy 2006-04-20 16:38:09.000000000 -0700
+++ devel-akpm/arch/i386/kernel/mpparse.c 2006-04-20 16:38:09.000000000 -0700
@@ -1131,7 +1131,6 @@ int mp_register_gsi (u32 gsi, int trigge
*/
int irq = gsi;
if (gsi < MAX_GSI_NUM) {
- extern int timer_uses_ioapic_pin_0;
/*
* Retain the VIA chipset work-around (gsi > 15), but
* avoid a problem where the 8254 timer (IRQ0) is setup
diff -puN arch/x86_64/kernel/io_apic.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy arch/x86_64/kernel/io_apic.c
--- devel/arch/x86_64/kernel/io_apic.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy 2006-04-20 16:38:09.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/io_apic.c 2006-04-20 16:38:09.000000000 -0700
@@ -49,6 +49,7 @@ int sis_apic_bug; /* not actually suppor
static int no_timer_check;
int disable_timer_pin_1 __initdata;
+int timer_uses_ioapic_pin_0;
int timer_over_8254 __initdata = 0;
@@ -1777,8 +1778,6 @@ static inline void unlock_ExtINT_logic(v
spin_unlock_irqrestore(&ioapic_lock, flags);
}
-int timer_uses_ioapic_pin_0;
-
/*
* This code may look a bit paranoid, but it's supposed to cooperate with
* a wide range of boards and BIOS bugs. Fortunately only the timer IRQ
diff -puN arch/x86_64/kernel/mpparse.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy arch/x86_64/kernel/mpparse.c
--- devel/arch/x86_64/kernel/mpparse.c~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy 2006-04-20 16:38:09.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/mpparse.c 2006-04-20 16:38:09.000000000 -0700
@@ -968,7 +968,6 @@ int mp_register_gsi(u32 gsi, int trigger
*/
int irq = gsi;
if (gsi < MAX_GSI_NUM) {
- extern int timer_uses_ioapic_pin_0;
/*
* Retain the VIA chipset work-around (gsi > 15), but
* avoid a problem where the 8254 timer (IRQ0) is setup
diff -puN include/asm-i386/apic.h~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy include/asm-i386/apic.h
--- devel/include/asm-i386/apic.h~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy 2006-04-20 16:38:09.000000000 -0700
+++ devel-akpm/include/asm-i386/apic.h 2006-04-20 16:38:09.000000000 -0700
@@ -131,6 +131,7 @@ extern unsigned int nmi_watchdog;
#define NMI_INVALID 3
extern int disable_timer_pin_1;
+extern int timer_uses_ioapic_pin_0;
void smp_send_timer_broadcast_ipi(struct pt_regs *regs);
void switch_APIC_timer_to_ipi(void *cpumask);
diff -puN include/asm-x86_64/apic.h~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy include/asm-x86_64/apic.h
--- devel/include/asm-x86_64/apic.h~x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy 2006-04-20 16:38:09.000000000 -0700
+++ devel-akpm/include/asm-x86_64/apic.h 2006-04-20 16:38:09.000000000 -0700
@@ -102,6 +102,7 @@ extern unsigned int nmi_watchdog;
#define NMI_INVALID 3
extern int disable_timer_pin_1;
+extern int timer_uses_ioapic_pin_0;
extern void setup_threshold_lvt(unsigned long lvt_off);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
config_net=n-build-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
sony_apci-resume.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
dvb-core-ule-fixes-and-rfc4326-additions-kernel-2616-tidy.patch
sparc32-vivi-fix.patch
git-dvb-compat-build-fix.patch
bt866-build-fix.patch
connector-exports.patch
git-libata-all.patch
git-mtd.patch
pci-error-recovery-e1000-network-device-driver.patch
git-net.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
git-pcmcia.patch
git-scsi-misc.patch
megaraid-unused-variable.patch
enable-advansys-driver.patch
advansys-warning-workaround.patch
scsi-clean-up-warnings-in-advansys-driver-fix.patch
git-watchdog.patch
arm-add_memory-build-fix.patch
pg_uncached-is-ia64-only.patch
migration-remove-unnecessary-pageswapcache-checks-fix.patch
wait_table-and-zonelist-initializing-for-memory-hotadd-wait_table-initialization-fixes.patch
preserve-write-permissions-in-migration-entries-fix.patch
slab-cleanup-kmem_getpages-fix.patch
slab-stop-using-list_for_each-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
acx1xx-wireless-driver.patch
x86-x86_64-avoid-irq0-ioapic-pin-collision-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
tpm-use-clear_bit-fix.patch
tpm-use-clear_bit-fix-fix.patch
tpm-use-clear_bit-fix-fix-fix-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.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
