diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 14:47:37 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 14:47:37 +0300 |
| commit | 0c54de146ef4303ed3c5879b043894c8db637507 (patch) | |
| tree | a4ff5bf27ffd2c4b71271b42014a0040490c7271 /arch/x86/include | |
| parent | 8faba6121566248330e738d25a2c43d7500fb9f0 (diff) | |
| parent | 7dc9c484a71525794ca05cf7a47f283f1b54cd12 (diff) | |
| download | linux-0c54de146ef4303ed3c5879b043894c8db637507.tar.xz | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mce.h | 3 | ||||
| -rw-r--r-- | arch/x86/include/asm/uv/uv_hub.h | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 858baa061cfc..6c3fdd631ed3 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -108,10 +108,11 @@ struct mce_log { #define K8_MCE_THRESHOLD_BANK_5 (MCE_THRESHOLD_BASE + 5 * 9) #define K8_MCE_THRESHOLD_DRAM_ECC (MCE_THRESHOLD_BANK_4 + 0) -extern struct atomic_notifier_head x86_mce_decoder_chain; #ifdef __KERNEL__ +extern struct atomic_notifier_head x86_mce_decoder_chain; + #include <linux/percpu.h> #include <linux/init.h> #include <asm/atomic.h> diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index bc54fa965af3..40be813fefb1 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h @@ -495,5 +495,17 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector) uv_write_global_mmr64(pnode, UVH_IPI_INT, val); } +/* + * Get the minimum revision number of the hub chips within the partition. + * 1 - initial rev 1.0 silicon + * 2 - rev 2.0 production silicon + */ +static inline int uv_get_min_hub_revision_id(void) +{ + extern int uv_min_hub_revision_id; + + return uv_min_hub_revision_id; +} + #endif /* CONFIG_X86_64 */ #endif /* _ASM_X86_UV_UV_HUB_H */ |