diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 16:43:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 16:43:20 -0700 |
| commit | 20d9207849d5abe60461841b3c3724f6e7c9d33e (patch) | |
| tree | 4466a988d7dd9f0e08225cf6faca1cd6ab6d7dde /arch/x86/include | |
| parent | c19f83669a02d4fa047d0d40f518e90f6f19c4c6 (diff) | |
| parent | 4ea3c51d5bd3bb4eea7d7d3a1f80d1a48c2a6f92 (diff) | |
| download | linux-stable-20d9207849d5abe60461841b3c3724f6e7c9d33e.tar.gz linux-stable-20d9207849d5abe60461841b3c3724f6e7c9d33e.tar.bz2 linux-stable-20d9207849d5abe60461841b3c3724f6e7c9d33e.zip | |
Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: UV BAU distribution and payload MMRs
x86: UV: BAU partition-relative distribution map
x86, uv: add Kconfig dependency on NUMA for UV systems
x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems
x86, UV: Fix for nodes with memory and no cpus
x86, UV: system table in bios accessed after unmap
x86: UV BAU messaging timeouts
x86: UV BAU and nodes with no memory
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/uv/uv_mmrs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h index db68ac8a5ac2..2cae46c7c8a2 100644 --- a/arch/x86/include/asm/uv/uv_mmrs.h +++ b/arch/x86/include/asm/uv/uv_mmrs.h @@ -17,6 +17,11 @@ /* ========================================================================= */ /* UVH_BAU_DATA_CONFIG */ /* ========================================================================= */ +#define UVH_LB_BAU_MISC_CONTROL 0x320170UL +#define UV_ENABLE_INTD_SOFT_ACK_MODE_SHIFT 15 +#define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHIFT 16 +#define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD 0x000000000bUL +/* 1011 timebase 7 (168millisec) * 3 ticks -> 500ms */ #define UVH_BAU_DATA_CONFIG 0x61680UL #define UVH_BAU_DATA_CONFIG_32 0x0438 |