From 256a2f1b99b1e5ac6addb6afee750544d14715db Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 9 Jul 2008 08:02:54 +0200 Subject: [PATCH] --- yaml --- r: 100031 b: refs/heads/master c: 26e9e57b106445bbd8c965985e4e8af5293ae005 h: refs/heads/master i: 100029: 3485649da0d72c5e94e15b4235968fac220e39d8 100027: 36119bd16a22f9d639d7ca4c8a6fc8823a13fd77 100023: 522ff56cc6b2a31da46b0a56fe1ca013d7785ce9 100015: 529127bf43402ac38ed35c69390339fb006dd0af 99999: 6bc5b24bd6cc3a4256192d673deafa4c61750d2f 99967: 760aeb1cecfd88d12557e52a5ec53f2a79a4323b v: v3 --- [refs] | 2 +- trunk/include/asm-x86/uv/uv_mmrs.h | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/[refs] b/[refs] index b5950b0f4207..04a4d6919e0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e407dffd17dcb592e1605a2b3dbbb81f9f3cbc21 +refs/heads/master: 26e9e57b106445bbd8c965985e4e8af5293ae005 diff --git a/trunk/include/asm-x86/uv/uv_mmrs.h b/trunk/include/asm-x86/uv/uv_mmrs.h index a8a1ad5c764f..151fd7fcb809 100644 --- a/trunk/include/asm-x86/uv/uv_mmrs.h +++ b/trunk/include/asm-x86/uv/uv_mmrs.h @@ -1027,32 +1027,6 @@ union uvh_rh_gam_mmioh_overlay_config_mmr_u { } 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 */ /* ========================================================================= */