]> err.no Git - linux-2.6/commit
x86, uv: build fix #2 for "x86, uv: update x86 mmr list for SGI uv"
authorIngo Molnar <mingo@elte.hu>
Wed, 9 Jul 2008 06:02:54 +0000 (08:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 9 Jul 2008 06:18:41 +0000 (08:18 +0200)
commit26e9e57b106445bbd8c965985e4e8af5293ae005
treeeb8102e8ac05e5a31ad5c1ef2a8e254a3f3c312a
parente407dffd17dcb592e1605a2b3dbbb81f9f3cbc21
x86, uv: build fix #2 for "x86, uv: update x86 mmr list for SGI uv"

fix:

 In file included from arch/x86/kernel/tlb_uv.c:14:
 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 another 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>
include/asm-x86/uv/uv_mmrs.h