Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e407dffd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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
5d061e39 "x86, uv: update x86 mmr list for SGI uv".

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5ed4273a

include/asm-x86/uv/uv_mmrs.h

+0 −20
Original line number Diff line number Diff line
@@ -973,26 +973,6 @@ union uvh_rh_gam_cfg_overlay_config_mmr_u { 
    } s;

};



/* ========================================================================= */

/*                    UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR                      */

/* ========================================================================= */

#define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR 0x1600020UL



#define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_BASE_SHFT 26

#define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL

#define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63

#define UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL



union uvh_rh_gam_cfg_overlay_config_mmr_u {

    unsigned long	v;

    struct uvh_rh_gam_cfg_overlay_config_mmr_s {

	unsigned long	rsvd_0_25: 26;  /*    */

	unsigned long	base   : 20;  /* RW */

	unsigned long	rsvd_46_62: 17;  /*    */

	unsigned long	enable :  1;  /* RW */

    } s;

};



/* ========================================================================= */

/*                    UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR                      */

/* ========================================================================= */