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

Commit 26e9e57b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

include/asm-x86/uv/uv_mmrs.h

+0 −26
Original line number Original line Diff line number Diff line
@@ -1027,32 +1027,6 @@ union uvh_rh_gam_mmioh_overlay_config_mmr_u { 
    } s;

    } s;

};

};





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

/*                   UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR                     */

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

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR 0x1600030UL



#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 30

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003fffc0000000UL

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL



union uvh_rh_gam_mmioh_overlay_config_mmr_u {

    unsigned long	v;

    struct uvh_rh_gam_mmioh_overlay_config_mmr_s {

	unsigned long	rsvd_0_29: 30;  /*    */

	unsigned long	base   : 16;  /* RW */

	unsigned long	m_io   :  6;  /* RW */

	unsigned long	n_io   :  4;  /* RW */

	unsigned long	rsvd_56_62:  7;  /*    */

	unsigned long	enable :  1;  /* RW */

    } s;

};



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

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

/*                    UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR                      */

/*                    UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR                      */

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

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