diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 21:59:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 21:59:18 +0300 |
| commit | c7e15899d07c9813c1aa96b21699d2d9c8314c4b (patch) | |
| tree | 16e9b4dceddf1b4d1dad05588d700c70cf8fcb88 /arch/x86/include/asm/uv/uv.h | |
| parent | f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 (diff) | |
| parent | 78c06176466cbd1b3f0f67709d3023c40dbebcbd (diff) | |
| download | linux-c7e15899d07c9813c1aa96b21699d2d9c8314c4b.tar.xz | |
Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Enable NMI on all cpus on UV
vgaarb: Add user selectability of the number of GPUS in a system
vgaarb: Fix VGA arbiter to accept PCI domains other than 0
x86, uv: Update UV arch to target Legacy VGA I/O correctly.
pci: Update pci_set_vga_state() to call arch functions
Diffstat (limited to 'arch/x86/include/asm/uv/uv.h')
| -rw-r--r-- | arch/x86/include/asm/uv/uv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h index c0a01b5d985b..3bb9491b7659 100644 --- a/arch/x86/include/asm/uv/uv.h +++ b/arch/x86/include/asm/uv/uv.h @@ -11,6 +11,7 @@ struct mm_struct; extern enum uv_system_type get_uv_system_type(void); extern int is_uv_system(void); extern void uv_cpu_init(void); +extern void uv_nmi_init(void); extern void uv_system_init(void); extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, struct mm_struct *mm, |