# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1292414340 0
# Node ID 16673224c1cc2ca3bb9730f1d7c84fe4d96e5323
# Parent 9e33a83b36df055f0b40c638e8823564f7f719b9
x86: adjust other interrupt related section placement
... and remove some variables the value of which is never used
altogether.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/ia64/xen/irq.c | 2 --
xen/arch/x86/apic.c | 9 ++++-----
xen/arch/x86/i8259.c | 1 -
xen/arch/x86/io_apic.c | 19 +++----------------
xen/arch/x86/irq.c | 6 ++----
xen/include/asm-x86/io_apic.h | 1 -
xen/include/asm-x86/irq.h | 3 ---
xen/include/asm-x86/mpspec.h | 1 -
8 files changed, 9 insertions(+), 33 deletions(-)
diff -r 9e33a83b36df -r 16673224c1cc xen/arch/ia64/xen/irq.c
--- a/xen/arch/ia64/xen/irq.c Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/arch/ia64/xen/irq.c Wed Dec 15 11:59:00 2010 +0000
@@ -127,8 +127,6 @@ hw_irq_controller no_irq_type = {
ack_none,
end_none
};
-
-atomic_t irq_err_count;
/*
* Generic enable/disable code: this just calls
diff -r 9e33a83b36df -r 16673224c1cc xen/arch/x86/apic.c
--- a/xen/arch/x86/apic.c Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/arch/x86/apic.c Wed Dec 15 11:59:00 2010 +0000
@@ -160,7 +160,7 @@ void __init apic_intr_init(void)
}
/* Using APIC to generate smp_local_timer_interrupt? */
-int using_apic_timer = 0;
+static bool_t __read_mostly using_apic_timer;
static int enabled_via_apicbase;
@@ -1083,9 +1083,7 @@ __next:
*****************************************************************************/
/* used for system time scaling */
-static unsigned long bus_freq; /* KAF: pointer-size avoids compile warns. */
-static u32 bus_cycle; /* length of one bus cycle in pico-seconds */
-static u32 bus_scale; /* scaling factor convert ns to bus cycles */
+static u32 __read_mostly bus_scale; /* scaling factor convert ns to bus cycles
*/
/*
* The timer chip is already set up at HZ interrupts per second here,
@@ -1197,6 +1195,8 @@ static int __init calibrate_APIC_clock(v
long tt1, tt2;
long result;
int i;
+ unsigned long bus_freq; /* KAF: pointer-size avoids compile warns. */
+ u32 bus_cycle; /* length of one bus cycle in pico-seconds */
const int LOOPS = HZ/10;
apic_printk(APIC_VERBOSE, "calibrating APIC timer ...\n");
@@ -1411,7 +1411,6 @@ fastcall void smp_error_interrupt(struct
apic_write(APIC_ESR, 0);
v1 = apic_read(APIC_ESR);
ack_APIC_irq();
- atomic_inc(&irq_err_count);
/* Here is what the APIC error bits mean:
0: Send CS error
diff -r 9e33a83b36df -r 16673224c1cc xen/arch/x86/i8259.c
--- a/xen/arch/x86/i8259.c Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/arch/x86/i8259.c Wed Dec 15 11:59:00 2010 +0000
@@ -284,7 +284,6 @@ static void mask_and_ack_8259A_irq(unsig
printk("spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
}
- atomic_inc(&irq_err_count);
/*
* Theoretically we do not have to handle this IRQ,
* but in Linux this does not cause problems and is
diff -r 9e33a83b36df -r 16673224c1cc xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/arch/x86/io_apic.c Wed Dec 15 11:59:00 2010 +0000
@@ -38,8 +38,6 @@
#include <io_ports.h>
#include <public/physdev.h>
-atomic_t irq_mis_count;
-
/* Where if anywhere is the i8259 connect in external int mode */
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
@@ -60,8 +58,6 @@ int sis_apic_bug = -1;
*/
int __read_mostly nr_ioapic_registers[MAX_IO_APICS];
int __read_mostly nr_ioapics;
-
-int disable_timer_pin_1 __initdata;
/*
* Rough estimation of how many shared IRQs there are, can
@@ -1641,7 +1637,6 @@ static void mask_and_ack_level_ioapic_ir
move_masked_irq(irq);
if ( !(v & (1 << (i & 0x1f))) ) {
- atomic_inc(&irq_mis_count);
spin_lock(&ioapic_lock);
__edge_IO_APIC_irq(irq);
__level_IO_APIC_irq(irq);
@@ -1707,7 +1702,6 @@ static void end_level_ioapic_irq (unsign
move_native_irq(irq);
if (!(v & (1 << (i & 0x1f)))) {
- atomic_inc(&irq_mis_count);
spin_lock(&ioapic_lock);
__mask_IO_APIC_irq(irq);
__edge_IO_APIC_irq(irq);
@@ -1845,7 +1839,7 @@ static hw_irq_controller lapic_irq_type
* cycles as some i82489DX-based boards have glue logic that keeps the
* 8259A interrupt line asserted until INTA. --macro
*/
-static inline void unlock_ExtINT_logic(void)
+static void __init unlock_ExtINT_logic(void)
{
int apic, pin, i;
struct IO_APIC_route_entry entry0, entry1;
@@ -1902,15 +1896,13 @@ 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
* is so screwy. Thanks to Brian Perkins for testing/hacking this beast
* fanatically on his truly buggy board.
*/
-static inline void check_timer(void)
+static void __init check_timer(void)
{
int apic1, pin1, apic2, pin2;
int vector, ret;
@@ -1948,9 +1940,6 @@ static inline void check_timer(void)
apic1 = find_isa_irq_apic(0, mp_INT);
pin2 = ioapic_i8259.pin;
apic2 = ioapic_i8259.apic;
-
- if (pin1 == 0)
- timer_uses_ioapic_pin_0 = 1;
printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d
pin2=%d\n",
vector, apic1, pin1, apic2, pin2);
@@ -1962,8 +1951,6 @@ static inline void check_timer(void)
unmask_IO_APIC_irq(0);
if (timer_irq_works()) {
local_irq_restore(flags);
- if (disable_timer_pin_1 > 0)
- clear_IO_APIC_pin(apic1, pin1);
return;
}
clear_IO_APIC_pin(apic1, pin1);
@@ -2131,7 +2118,7 @@ int __init io_apic_get_unique_id (int io
int __init io_apic_get_unique_id (int ioapic, int apic_id)
{
union IO_APIC_reg_00 reg_00;
- static physid_mask_t apic_id_map = PHYSID_MASK_NONE;
+ static physid_mask_t __initdata apic_id_map = PHYSID_MASK_NONE;
physid_mask_t tmp;
unsigned long flags;
int i = 0;
diff -r 9e33a83b36df -r 16673224c1cc xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/arch/x86/irq.c Wed Dec 15 11:59:00 2010 +0000
@@ -74,7 +74,7 @@ void unlock_vector_lock(void)
spin_unlock(&vector_lock);
}
-static int __bind_irq_vector(int irq, int vector, cpumask_t cpu_mask)
+static int __init __bind_irq_vector(int irq, int vector, cpumask_t cpu_mask)
{
cpumask_t online_mask;
int cpu;
@@ -100,7 +100,7 @@ static int __bind_irq_vector(int irq, in
return 0;
}
-int bind_irq_vector(int irq, int vector, cpumask_t cpu_mask)
+int __init bind_irq_vector(int irq, int vector, cpumask_t cpu_mask)
{
unsigned long flags;
int ret;
@@ -327,8 +327,6 @@ hw_irq_controller no_irq_type = {
ack_none,
end_none
};
-
-atomic_t irq_err_count;
int __assign_irq_vector(int irq, struct irq_cfg *cfg, const cpumask_t *mask)
{
diff -r 9e33a83b36df -r 16673224c1cc xen/include/asm-x86/io_apic.h
--- a/xen/include/asm-x86/io_apic.h Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/include/asm-x86/io_apic.h Wed Dec 15 11:59:00 2010 +0000
@@ -190,7 +190,6 @@ extern int io_apic_get_version (int ioap
extern int io_apic_get_version (int ioapic);
extern int io_apic_get_redir_entries (int ioapic);
extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int
edge_level, int active_high_low);
-extern int timer_uses_ioapic_pin_0;
#endif /*CONFIG_ACPI_BOOT*/
extern void init_ioapic_mappings(void);
diff -r 9e33a83b36df -r 16673224c1cc xen/include/asm-x86/irq.h
--- a/xen/include/asm-x86/irq.h Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/include/asm-x86/irq.h Wed Dec 15 11:59:00 2010 +0000
@@ -102,9 +102,6 @@ void setup_ioapic_dest(void);
extern unsigned long io_apic_irqs;
-extern atomic_t irq_err_count;
-extern atomic_t irq_mis_count;
-
DECLARE_PER_CPU(unsigned int, irq_count);
int pirq_shared(struct domain *d , int irq);
diff -r 9e33a83b36df -r 16673224c1cc xen/include/asm-x86/mpspec.h
--- a/xen/include/asm-x86/mpspec.h Wed Dec 15 11:57:54 2010 +0000
+++ b/xen/include/asm-x86/mpspec.h Wed Dec 15 11:59:00 2010 +0000
@@ -21,7 +21,6 @@ extern int mpc_default_type;
extern int mpc_default_type;
extern unsigned long mp_lapic_addr;
extern int pic_mode;
-extern int using_apic_timer;
#ifdef CONFIG_ACPI
extern int mp_register_lapic (u32 id, u8 enabled);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home