i386/x86_64 io_apic.c: misc cleanups (fwd)
PATCH 1/1 i386/x86_64 io_apic.c: misc cleanups (fwd)
The patch forwarded below still applies and compiles against 2.6.11-rc1-mm1.
Please apply.
----- Forwarded message from Adrian Bunk <[email protected]> -----
Date: Wed, 1 Dec 2004 22:45:52 +0100
From: Adrian Bunk <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [2.6 patch] i386/x86_64 io_apic.c: misc cleanups
The patch below contains the following cleanups:
- make some needlessly global code static
- #if 0 some global print* functions that have no user
diffstat output:
arch/i386/kernel/io_apic.c | 14 +++++++++----- arch/x86_64/kernel/io_apic.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-)
arch/i386/kernel/io_apic.c renamed from arch/i386/kernel/io_apic.c.old +9 -5
@@ -187,7 +187,7 @@spin_unlock_irqrestore (&ioapic_lock, flags); } -void clear_IO_APIC_pin (unsigned int apic,unsigned int pin) +static void clear_IO_APIC_pin (unsigned int apic,unsigned int pin) {struct IO_APIC_route_entry entry;unsigned long flags;
@@ -685,8 +685,8 @@*/ #define MAX_PIRQS 8 -int pirq_entries [MAX_PIRQS ]; -int pirqs_enabled; +static int pirq_entries [MAX_PIRQS ]; +static int pirqs_enabled;int skip_ioapic_setup;static int __init ioapic_setup (char *str)
@@ -1179,7 +1179,7 @@ } } -void __init setup_IO_APIC_irqs (void ) +static void __init setup_IO_APIC_irqs (void ) {struct IO_APIC_route_entry entry;int apic, pin, idx, irq, first_notcon =1 , vector;
@@ -1258,7 +1258,7 @@/* * Set up the 8259A-master output pin: */ -void __init setup_ExtINT_IRQ0_pin (unsigned int pin,int vector) +static void __init setup_ExtINT_IRQ0_pin (unsigned int pin,int vector) {struct IO_APIC_route_entry entry;unsigned long flags;
@@ -1452,6 +1452,8 @@return ; } +#if 0 +static void print_APIC_bitfield (int base) {unsigned int v;
@@ -1594,6 +1596,8 @@ printk(KERN_DEBUG "... PIC ELCR: %04x\n", v); } +#endif /* 0 */ +static void __init enable_IO_APIC (void ) {union IO_APIC_reg_01 reg_01;
arch/x86_64/kernel/io_apic.c renamed from arch/x86_64/kernel/io_apic.c.old +9 -5
@@ -147,7 +147,7 @@spin_unlock_irqrestore (&ioapic_lock, flags); } -void clear_IO_APIC_pin (unsigned int apic,unsigned int pin) +static void clear_IO_APIC_pin (unsigned int apic,unsigned int pin) {struct IO_APIC_route_entry entry;unsigned long flags;
@@ -185,8 +185,8 @@*/ #define MAX_PIRQS 8 -int pirq_entries [MAX_PIRQS ]; -int pirqs_enabled; +static int pirq_entries [MAX_PIRQS ]; +static int pirqs_enabled;int skip_ioapic_setup;int ioapic_force;
@@ -707,7 +707,7 @@ } } -void __init setup_IO_APIC_irqs (void ) +static void __init setup_IO_APIC_irqs (void ) {struct IO_APIC_route_entry entry;int apic, pin, idx, irq, first_notcon =1 , vector;
@@ -776,7 +776,7 @@* Set up the 8259A-master output pin as broadcast to all * CPUs. */ -void __init setup_ExtINT_IRQ0_pin (unsigned int pin,int vector) +static void __init setup_ExtINT_IRQ0_pin (unsigned int pin,int vector) {struct IO_APIC_route_entry entry;unsigned long flags;
@@ -948,6 +948,8 @@return ; } +#if 0 + static __apicdebuginit void print_APIC_bitfield (int base) {unsigned int v;
@@ -1090,6 +1092,8 @@ printk(KERN_DEBUG "... PIC ELCR: %04x\n", v); } +#endif /* 0 */ +static void __init enable_IO_APIC (void ) {union IO_APIC_reg_01 reg_01;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
----- End forwarded message -----