Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc3ca39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of... 

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, nmi: Use predefined numbers instead of hardcoded one
  x86: asm/processor.h: remove double declaration
  x86, mtrr: replace MTRRdefType_MSR with msr-index's MSR_MTRRdefType
  x86, mtrr: replace MTRRfix4K_C0000_MSR with msr-index's MSR_MTRRfix4K_C0000
  x86, mtrr: remove mtrr MSRs double declaration
  x86, mtrr: replace MTRRfix16K_80000_MSR with msr-index's MSR_MTRRfix16K_80000
  x86, mtrr: replace MTRRfix64K_00000_MSR with msr-index's MSR_MTRRfix64K_00000
  x86, mtrr: replace MTRRcap_MSR with msr-index's MSR_MTRRcap
  x86: mce: remove duplicated #include
  x86: msr-index.h remove duplicate MSR C001_0015 declaration
  x86: clean up arch/x86/kernel/tsc_sync.c a bit
  x86: use symbolic name for VM86_SIGNAL when used as vm86 default return
  x86: added 'ifndef _ASM_X86_IOMAP_H' to iomap.h
  x86: avoid multiple declaration of kstack_depth_to_print
  x86: vdso/vma.c declare vdso_enabled and arch_setup_additional_pages before they get used
  x86: clean up declarations and variables
  x86: apic/x2apic_cluster.c x86_cpu_to_logical_apicid should be static
  x86 early quirks: eliminate unused function
parents aa98936e a4046f8d

arch/x86/include/asm/apic.h

+3 −0
Original line number Diff line number Diff line
@@ -470,6 +470,9 @@ static inline unsigned int read_apic_id(void) 
extern void default_setup_apic_routing(void);



#ifdef CONFIG_X86_32



extern struct apic apic_default;



/*

 * Set up the logical destination ID.

 *

arch/x86/include/asm/hw_irq.h

+4 −0
Original line number Diff line number Diff line
@@ -97,7 +97,11 @@ extern void eisa_set_level_irq(unsigned int irq); 
/* SMP */

extern void smp_apic_timer_interrupt(struct pt_regs *);

extern void smp_spurious_interrupt(struct pt_regs *);

extern void smp_generic_interrupt(struct pt_regs *);

extern void smp_error_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_IO_APIC

extern asmlinkage void smp_irq_move_cleanup_interrupt(void);

#endif

#ifdef CONFIG_SMP

extern void smp_reschedule_interrupt(struct pt_regs *);

extern void smp_call_function_interrupt(struct pt_regs *);

arch/x86/include/asm/iomap.h

+5 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_IOMAP_H

#define _ASM_X86_IOMAP_H



/*

 * Copyright © 2008 Ingo Molnar

 *
@@ -31,3 +34,5 @@ iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); 


void

iounmap_atomic(void *kvaddr, enum km_type type);



#endif /* _ASM_X86_IOMAP_H */

arch/x86/include/asm/msr-index.h

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ 
#define MSR_K8_TOP_MEM1			0xc001001a

#define MSR_K8_TOP_MEM2			0xc001001d

#define MSR_K8_SYSCFG			0xc0010010

#define MSR_K8_HWCR			0xc0010015

#define MSR_K8_INT_PENDING_MSG		0xc0010055

/* C1E active bits in int pending message */

#define K8_INTP_C1E_ACTIVE_MASK		0x18000000

arch/x86/include/asm/nmi.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static inline int nmi_watchdog_active(void) 
	 * but since they are power of two we could use a

	 * cheaper way --cvg

	 */

	return nmi_watchdog & 0x3;

	return nmi_watchdog & (NMI_LOCAL_APIC | NMI_IO_APIC);

}

#endif