diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-13 21:49:12 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-13 21:49:12 +0300 |
| commit | fe377e8fb3f67d66590e41e99cd6e207d585f7dd (patch) | |
| tree | aef88767bd67100120fce449f9b21da433865969 /arch/x86/include/asm/uv/uv_mmrs.h | |
| parent | 946524efb4912687b6e02e831b5fbedc4c9395c0 (diff) | |
| parent | f3ad116588151b3371ae4e092290e4f48e62b8bb (diff) | |
Merge commit 'linus/master' into topic/slqb/core
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/x86/include/asm/uv/uv_mmrs.h')
| -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 |