diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 15:33:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 15:33:12 -0800 |
| commit | a8e782348d9f0dc64f6adb81f5f6959921949f13 (patch) | |
| tree | 7a51119583b33fd2394f45dc3f7ff56b65095774 /arch/x86/include/asm/apic.h | |
| parent | 6680598b44ed3c0052d155522eb21fc5a00de5f3 (diff) | |
| parent | 47dabdc7fcd4daa52dcda72a1f18603dd168355d (diff) | |
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: (27 commits)
x86: mpparse.c fix style problems
x86: nmi.c fix style problems
x86: ldt.c fix style problems
x86: cpuid.c fix style problems
x86, UV: remove erroneous BAU initialization
x86: fix incorrect __read_mostly on _boot_cpu_pda
x86: convert permanent_kmaps_init() from macro to inline
x86: early_printk - use sizeof instead of hardcoded number
x86: xsave.c: restore_user_xstate should be static
x86: uv_bau.h: fix dubious bitfield
x86: apic.c: xapic_icr_read and x2apic_icr_read should be static
x86: bios_uv.c: uv_systab should be static
x86: genx2apic_phys.c: x2apic_send_IPI_self and init_x2apic_ldr should be static
x86: amd_iommu.c: prealloc_protection_domains should be static
x86: amd_iommu_init.c: iommu_enable and iommu_enable_event_logging should be static
x86, pci: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
x86_64: pci-gart_64.c iommu_fullflush should be static
x86: efi.c declare add_efi_memmap before they get used
x86: io_apic.c io_apic_sync should be static
x86: apic.c declare pic_mode before they get used
...
Diffstat (limited to 'arch/x86/include/asm/apic.h')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 25caa0738af..ab1d51a8855 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -54,7 +54,6 @@ extern int disable_apic; extern int is_vsmp_box(void); extern void xapic_wait_icr_idle(void); extern u32 safe_xapic_wait_icr_idle(void); -extern u64 xapic_icr_read(void); extern void xapic_icr_write(u32, u32); extern int setup_profiling_timer(unsigned int); @@ -93,7 +92,7 @@ static inline u32 native_apic_msr_read(u32 reg) } #ifndef CONFIG_X86_32 -extern int x2apic, x2apic_preenabled; +extern int x2apic; extern void check_x2apic(void); extern void enable_x2apic(void); extern void enable_IR_x2apic(void); |