Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: add linux kernel support for YMM state x86: fix wrong section of pat_disable & make it static x86: Fix section mismatches in mpparse x86: fix set_fixmap to use phys_addr_t x86: Document get_user_pages_fast() x86, intr-remap: fix eoi for interrupt remapping without x2apic
This commit is contained in:
@ -2524,7 +2524,6 @@ static void irq_complete_move(struct irq_desc **descp)
|
||||
static inline void irq_complete_move(struct irq_desc **descp) {}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_X86_X2APIC
|
||||
static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)
|
||||
{
|
||||
int apic, pin;
|
||||
@ -2558,6 +2557,7 @@ eoi_ioapic_irq(struct irq_desc *desc)
|
||||
spin_unlock_irqrestore(&ioapic_lock, flags);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_X86_X2APIC
|
||||
static void ack_x2apic_level(unsigned int irq)
|
||||
{
|
||||
struct irq_desc *desc = irq_to_desc(irq);
|
||||
@ -2634,6 +2634,9 @@ static void ack_apic_level(unsigned int irq)
|
||||
*/
|
||||
ack_APIC_irq();
|
||||
|
||||
if (irq_remapped(irq))
|
||||
eoi_ioapic_irq(desc);
|
||||
|
||||
/* Now we can move and renable the irq */
|
||||
if (unlikely(do_unmask_irq)) {
|
||||
/* Only migrate the irq if the ack has been received.
|
||||
|
@ -679,7 +679,7 @@ void __init get_smp_config(void)
|
||||
__get_smp_config(0);
|
||||
}
|
||||
|
||||
static void smp_reserve_bootmem(struct mpf_intel *mpf)
|
||||
static void __init smp_reserve_bootmem(struct mpf_intel *mpf)
|
||||
{
|
||||
unsigned long size = get_mpc_size(mpf->physptr);
|
||||
#ifdef CONFIG_X86_32
|
||||
@ -838,7 +838,7 @@ static int __init get_MP_intsrc_index(struct mpc_intsrc *m)
|
||||
|
||||
static struct mpc_intsrc __initdata *m_spare[SPARE_SLOT_NUM];
|
||||
|
||||
static void check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
|
||||
static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -866,7 +866,8 @@ static void check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
|
||||
}
|
||||
}
|
||||
#else /* CONFIG_X86_IO_APIC */
|
||||
static inline void check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
|
||||
static
|
||||
inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
|
||||
#endif /* CONFIG_X86_IO_APIC */
|
||||
|
||||
static int check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length,
|
||||
|
@ -324,7 +324,7 @@ void __ref xsave_cntxt_init(void)
|
||||
}
|
||||
|
||||
/*
|
||||
* for now OS knows only about FP/SSE
|
||||
* Support only the state known to OS.
|
||||
*/
|
||||
pcntxt_mask = pcntxt_mask & XCNTXT_MASK;
|
||||
xsave_init();
|
||||
|
Reference in New Issue
Block a user