diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-09 02:00:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 02:18:41 -0400 |
| commit | e407dffd17dcb592e1605a2b3dbbb81f9f3cbc21 (patch) | |
| tree | 83a23f97e9c15c328b4d6c2a7d7fd2aa6957cffb /include/asm-x86/uv | |
| parent | 5ed4273af8469ca4723d4bf1bcd3abe2cc792e9f (diff) | |
x86, uv: build fix for "x86, uv: update x86 mmr list for SGI uv"
fix:
In file included from arch/x86/kernel/genx2apic_uv_x.c:25:
include/asm/uv/uv_mmrs.h:986: error: redefinition of ‘union uvh_rh_gam_cfg_overlay_config_mmr_u’
include/asm/uv/uv_mmrs.h:988: error: redefinition of ‘struct uvh_rh_gam_cfg_overlay_config_mmr_s’
include/asm/uv/uv_mmrs.h:1064: error: redefinition of ‘union uvh_rh_gam_mmioh_overlay_config_mmr_u’
include/asm/uv/uv_mmrs.h:1066: error: redefinition of ‘struct uvh_rh_gam_mmioh_overlay_config_mmr_s’
caused by duplicate section (cut & paste error) in commit
5d061e397db1 "x86, uv: update x86 mmr list for SGI uv".
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/uv')
| -rw-r--r-- | include/asm-x86/uv/uv_mmrs.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-x86/uv/uv_mmrs.h b/include/asm-x86/uv/uv_mmrs.h index eb59201dc012..a8a1ad5c764f 100644 --- a/include/asm-x86/uv/uv_mmrs.h +++ b/include/asm-x86/uv/uv_mmrs.h | |||
| @@ -974,26 +974,6 @@ union uvh_rh_gam_cfg_overlay_config_mmr_u { | |||
| 974 | }; | 974 | }; |
| 975 | 975 | ||
| 976 | /* ========================================================================= */ | 976 | /* ========================================================================= */ |
| 977 | /* UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR */ | ||
| 978 | /* ========================================================================= */ | ||
| 979 | #define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR 0x1600020UL | ||
| 980 | |||
| 981 | #define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_BASE_SHFT 26 | ||
| 982 | #define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL | ||
| 983 | #define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | ||
| 984 | #define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | ||
| 985 | |||
| 986 | union uvh_rh_gam_cfg_overlay_config_mmr_u { | ||
| 987 | unsigned long v; | ||
| 988 | struct uvh_rh_gam_cfg_overlay_config_mmr_s { | ||
| 989 | unsigned long rsvd_0_25: 26; /* */ | ||
| 990 | unsigned long base : 20; /* RW */ | ||
| 991 | unsigned long rsvd_46_62: 17; /* */ | ||
| 992 | unsigned long enable : 1; /* RW */ | ||
| 993 | } s; | ||
| 994 | }; | ||
| 995 | |||
| 996 | /* ========================================================================= */ | ||
| 997 | /* UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR */ | 977 | /* UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR */ |
| 998 | /* ========================================================================= */ | 978 | /* ========================================================================= */ |
| 999 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR 0x1600010UL | 979 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR 0x1600010UL |