mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
Merge branch 'x86/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tiptop into x86/cleanups
This commit is contained in:
commit
5c8cd82ed7
5 changed files with 26 additions and 38 deletions
|
@ -72,7 +72,7 @@ extern int e820_all_mapped(u64 start, u64 end, unsigned type);
|
|||
extern void e820_add_region(u64 start, u64 size, int type);
|
||||
extern void e820_print_map(char *who);
|
||||
extern int
|
||||
sanitize_e820_map(struct e820entry *biosmap, int max_nr_map, int *pnr_map);
|
||||
sanitize_e820_map(struct e820entry *biosmap, int max_nr_map, u32 *pnr_map);
|
||||
extern u64 e820_update_range(u64 start, u64 size, unsigned old_type,
|
||||
unsigned new_type);
|
||||
extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type,
|
||||
|
|
|
@ -1428,7 +1428,6 @@ void __setup_vector_irq(int cpu)
|
|||
|
||||
static struct irq_chip ioapic_chip;
|
||||
static struct irq_chip ir_ioapic_chip;
|
||||
static struct irq_chip msi_ir_chip;
|
||||
|
||||
#define IOAPIC_AUTO -1
|
||||
#define IOAPIC_EDGE 0
|
||||
|
@ -2663,20 +2662,20 @@ static struct irq_chip ioapic_chip __read_mostly = {
|
|||
.retrigger = ioapic_retrigger_irq,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_INTR_REMAP
|
||||
static struct irq_chip ir_ioapic_chip __read_mostly = {
|
||||
.name = "IR-IO-APIC",
|
||||
.startup = startup_ioapic_irq,
|
||||
.mask = mask_IO_APIC_irq,
|
||||
.unmask = unmask_IO_APIC_irq,
|
||||
#ifdef CONFIG_INTR_REMAP
|
||||
.ack = ack_x2apic_edge,
|
||||
.eoi = ack_x2apic_level,
|
||||
#ifdef CONFIG_SMP
|
||||
.set_affinity = set_ir_ioapic_affinity_irq,
|
||||
#endif
|
||||
#endif
|
||||
.retrigger = ioapic_retrigger_irq,
|
||||
};
|
||||
#endif
|
||||
|
||||
static inline void init_IO_APIC_traps(void)
|
||||
{
|
||||
|
@ -3391,18 +3390,18 @@ static struct irq_chip msi_chip = {
|
|||
.retrigger = ioapic_retrigger_irq,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_INTR_REMAP
|
||||
static struct irq_chip msi_ir_chip = {
|
||||
.name = "IR-PCI-MSI",
|
||||
.unmask = unmask_msi_irq,
|
||||
.mask = mask_msi_irq,
|
||||
#ifdef CONFIG_INTR_REMAP
|
||||
.ack = ack_x2apic_edge,
|
||||
#ifdef CONFIG_SMP
|
||||
.set_affinity = ir_set_msi_irq_affinity,
|
||||
#endif
|
||||
#endif
|
||||
.retrigger = ioapic_retrigger_irq,
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Map the PCI dev to the corresponding remapping hardware unit
|
||||
|
|
|
@ -3,25 +3,25 @@
|
|||
#define ARCH_X86_CPU_H
|
||||
|
||||
struct cpu_model_info {
|
||||
int vendor;
|
||||
int family;
|
||||
const char *model_names[16];
|
||||
int vendor;
|
||||
int family;
|
||||
const char *model_names[16];
|
||||
};
|
||||
|
||||
/* attempt to consolidate cpu attributes */
|
||||
struct cpu_dev {
|
||||
const char * c_vendor;
|
||||
const char *c_vendor;
|
||||
|
||||
/* some have two possibilities for cpuid string */
|
||||
const char * c_ident[2];
|
||||
const char *c_ident[2];
|
||||
|
||||
struct cpu_model_info c_models[4];
|
||||
|
||||
void (*c_early_init)(struct cpuinfo_x86 *c);
|
||||
void (*c_init)(struct cpuinfo_x86 * c);
|
||||
void (*c_identify)(struct cpuinfo_x86 * c);
|
||||
unsigned int (*c_size_cache)(struct cpuinfo_x86 * c, unsigned int size);
|
||||
int c_x86_vendor;
|
||||
void (*c_early_init)(struct cpuinfo_x86 *);
|
||||
void (*c_init)(struct cpuinfo_x86 *);
|
||||
void (*c_identify)(struct cpuinfo_x86 *);
|
||||
unsigned int (*c_size_cache)(struct cpuinfo_x86 *, unsigned int);
|
||||
int c_x86_vendor;
|
||||
};
|
||||
|
||||
#define cpu_dev_register(cpu_devX) \
|
||||
|
|
|
@ -233,7 +233,7 @@ void __init e820_print_map(char *who)
|
|||
*/
|
||||
|
||||
int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,
|
||||
int *pnr_map)
|
||||
u32 *pnr_map)
|
||||
{
|
||||
struct change_member {
|
||||
struct e820entry *pbios; /* pointer to original bios entry */
|
||||
|
@ -552,7 +552,7 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type,
|
|||
|
||||
void __init update_e820(void)
|
||||
{
|
||||
int nr_map;
|
||||
u32 nr_map;
|
||||
|
||||
nr_map = e820.nr_map;
|
||||
if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr_map))
|
||||
|
@ -563,7 +563,7 @@ void __init update_e820(void)
|
|||
}
|
||||
static void __init update_e820_saved(void)
|
||||
{
|
||||
int nr_map;
|
||||
u32 nr_map;
|
||||
|
||||
nr_map = e820_saved.nr_map;
|
||||
if (sanitize_e820_map(e820_saved.map, ARRAY_SIZE(e820_saved.map), &nr_map))
|
||||
|
@ -1303,7 +1303,7 @@ early_param("memmap", parse_memmap_opt);
|
|||
void __init finish_e820_parsing(void)
|
||||
{
|
||||
if (userdef) {
|
||||
int nr = e820.nr_map;
|
||||
u32 nr = e820.nr_map;
|
||||
|
||||
if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr) < 0)
|
||||
early_panic("Invalid user supplied memory map");
|
||||
|
@ -1386,7 +1386,7 @@ void __init e820_reserve_resources_late(void)
|
|||
char *__init default_machine_specific_memory_setup(void)
|
||||
{
|
||||
char *who = "BIOS-e820";
|
||||
int new_nr;
|
||||
u32 new_nr;
|
||||
/*
|
||||
* Try to copy the BIOS-supplied E820-map.
|
||||
*
|
||||
|
|
|
@ -58,6 +58,11 @@ static int show_other_interrupts(struct seq_file *p, int prec)
|
|||
for_each_online_cpu(j)
|
||||
seq_printf(p, "%10u ", irq_stats(j)->apic_timer_irqs);
|
||||
seq_printf(p, " Local timer interrupts\n");
|
||||
|
||||
seq_printf(p, "%*s: ", prec, "SPU");
|
||||
for_each_online_cpu(j)
|
||||
seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count);
|
||||
seq_printf(p, " Spurious interrupts\n");
|
||||
#endif
|
||||
if (generic_interrupt_extension) {
|
||||
seq_printf(p, "PLT: ");
|
||||
|
@ -90,12 +95,6 @@ static int show_other_interrupts(struct seq_file *p, int prec)
|
|||
seq_printf(p, "%10u ", irq_stats(j)->irq_threshold_count);
|
||||
seq_printf(p, " Threshold APIC interrupts\n");
|
||||
# endif
|
||||
#endif
|
||||
#ifdef CONFIG_X86_LOCAL_APIC
|
||||
seq_printf(p, "%*s: ", prec, "SPU");
|
||||
for_each_online_cpu(j)
|
||||
seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count);
|
||||
seq_printf(p, " Spurious interrupts\n");
|
||||
#endif
|
||||
seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
|
||||
#if defined(CONFIG_X86_IO_APIC)
|
||||
|
@ -133,23 +132,15 @@ int show_interrupts(struct seq_file *p, void *v)
|
|||
return 0;
|
||||
|
||||
spin_lock_irqsave(&desc->lock, flags);
|
||||
#ifndef CONFIG_SMP
|
||||
any_count = kstat_irqs(i);
|
||||
#else
|
||||
for_each_online_cpu(j)
|
||||
any_count |= kstat_irqs_cpu(i, j);
|
||||
#endif
|
||||
action = desc->action;
|
||||
if (!action && !any_count)
|
||||
goto out;
|
||||
|
||||
seq_printf(p, "%*d: ", prec, i);
|
||||
#ifndef CONFIG_SMP
|
||||
seq_printf(p, "%10u ", kstat_irqs(i));
|
||||
#else
|
||||
for_each_online_cpu(j)
|
||||
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
|
||||
#endif
|
||||
seq_printf(p, " %8s", desc->chip->name);
|
||||
seq_printf(p, "-%-8s", desc->name);
|
||||
|
||||
|
@ -174,6 +165,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
|
|||
|
||||
#ifdef CONFIG_X86_LOCAL_APIC
|
||||
sum += irq_stats(cpu)->apic_timer_irqs;
|
||||
sum += irq_stats(cpu)->irq_spurious_count;
|
||||
#endif
|
||||
if (generic_interrupt_extension)
|
||||
sum += irq_stats(cpu)->generic_irqs;
|
||||
|
@ -187,9 +179,6 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
|
|||
# ifdef CONFIG_X86_64
|
||||
sum += irq_stats(cpu)->irq_threshold_count;
|
||||
#endif
|
||||
#endif
|
||||
#ifdef CONFIG_X86_LOCAL_APIC
|
||||
sum += irq_stats(cpu)->irq_spurious_count;
|
||||
#endif
|
||||
return sum;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue