git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
io_apic.c
diff --git
a/arch/i386/kernel/io_apic.c
b/arch/i386/kernel/io_apic.c
index
4b6477b
..
7a324e8
100644
(file)
--- a/
arch/i386/kernel/io_apic.c
+++ b/
arch/i386/kernel/io_apic.c
@@
-188,7
+188,7
@@
static void unmask_IO_APIC_irq (unsigned int irq)
spin_unlock_irqrestore(&ioapic_lock, flags);
}
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;
{
struct IO_APIC_route_entry entry;
unsigned long flags;
@@
-264,7
+264,7
@@
cpumask_t __cacheline_aligned pending_irq_balance_cpumask[NR_IRQS];
static int irqbalance_disabled = IRQBALANCE_CHECK_ARCH;
static int physical_balance = 0;
static int irqbalance_disabled = IRQBALANCE_CHECK_ARCH;
static int physical_balance = 0;
-struct irq_cpu_info {
+st
atic st
ruct irq_cpu_info {
unsigned long * last_irq;
unsigned long * irq_delta;
unsigned long irq;
unsigned long * last_irq;
unsigned long * irq_delta;
unsigned long irq;
@@
-275,7
+275,7
@@
struct irq_cpu_info {
#define IRQ_DELTA(cpu,irq) (irq_cpu_data[cpu].irq_delta[irq])
#define IDLE_ENOUGH(cpu,now) \
#define IRQ_DELTA(cpu,irq) (irq_cpu_data[cpu].irq_delta[irq])
#define IDLE_ENOUGH(cpu,now) \
-
(idle_cpu(cpu) && ((now) - irq_stat[(cpu)]
.idle_timestamp > 1))
+
(idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu))
.idle_timestamp > 1))
#define IRQ_ALLOWED(cpu, allowed_mask) cpu_isset(cpu, allowed_mask)
#define IRQ_ALLOWED(cpu, allowed_mask) cpu_isset(cpu, allowed_mask)
@@
-286,7
+286,7
@@
struct irq_cpu_info {
#define BALANCED_IRQ_MORE_DELTA (HZ/10)
#define BALANCED_IRQ_LESS_DELTA (HZ)
#define BALANCED_IRQ_MORE_DELTA (HZ/10)
#define BALANCED_IRQ_LESS_DELTA (HZ)
-long balanced_irq_interval = MAX_BALANCED_IRQ_INTERVAL;
+
static
long balanced_irq_interval = MAX_BALANCED_IRQ_INTERVAL;
static unsigned long move(int curr_cpu, cpumask_t allowed_mask,
unsigned long now, int direction)
static unsigned long move(int curr_cpu, cpumask_t allowed_mask,
unsigned long now, int direction)
@@
-685,8
+685,8
@@
void fastcall send_IPI_self(int vector)
*/
#define MAX_PIRQS 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)
int skip_ioapic_setup;
static int __init ioapic_setup(char *str)
@@
-1179,7
+1179,7
@@
static inline void ioapic_register_intr(int irq, int vector, unsigned long trigg
}
}
}
}
-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;
{
struct IO_APIC_route_entry entry;
int apic, pin, idx, irq, first_notcon = 1, vector;
@@
-1258,7
+1258,7
@@
void __init setup_IO_APIC_irqs(void)
/*
* Set up the 8259A-master output pin:
*/
/*
* 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;
{
struct IO_APIC_route_entry entry;
unsigned long flags;
@@
-1452,6
+1452,8
@@
void __init print_IO_APIC(void)
return;
}
return;
}
+#if 0
+
static void print_APIC_bitfield (int base)
{
unsigned int v;
static void print_APIC_bitfield (int base)
{
unsigned int v;
@@
-1594,6
+1596,8
@@
void /*__init*/ print_PIC(void)
printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);
}
printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);
}
+#endif /* 0 */
+
static void __init enable_IO_APIC(void)
{
union IO_APIC_reg_01 reg_01;
static void __init enable_IO_APIC(void)
{
union IO_APIC_reg_01 reg_01;
@@
-2171,7
+2175,6
@@
static inline void check_timer(void)
disable_8259A_irq(0);
setup_nmi();
enable_8259A_irq(0);
disable_8259A_irq(0);
setup_nmi();
enable_8259A_irq(0);
- check_nmi_watchdog();
}
return;
}
}
return;
}
@@
-2194,7
+2197,6
@@
static inline void check_timer(void)
add_pin_to_irq(0, 0, pin2);
if (nmi_watchdog == NMI_IO_APIC) {
setup_nmi();
add_pin_to_irq(0, 0, pin2);
if (nmi_watchdog == NMI_IO_APIC) {
setup_nmi();
- check_nmi_watchdog();
}
return;
}
}
return;
}
@@
-2295,7
+2297,7
@@
struct sysfs_ioapic_data {
};
static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS];
};
static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS];
-static int ioapic_suspend(struct sys_device *dev,
u32
state)
+static int ioapic_suspend(struct sys_device *dev,
pm_message_t
state)
{
struct IO_APIC_route_entry *entry;
struct sysfs_ioapic_data *data;
{
struct IO_APIC_route_entry *entry;
struct sysfs_ioapic_data *data;