diff for duplicates of <20080702204755.GA6744@sgi.com> diff --git a/a/1.txt b/N1/1.txt index b74216c..63a4557 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,8 @@ Signed-off-by: Dimitri Sivanich <sivanich@sgi.com> Index: linux/include/asm-ia64/uv/uv_mmrs.h -=================================--- linux.orig/include/asm-ia64/uv/uv_mmrs.h 2008-07-02 14:15:39.000000000 -0500 +=================================================================== +--- linux.orig/include/asm-ia64/uv/uv_mmrs.h 2008-07-02 14:15:39.000000000 -0500 +++ linux/include/asm-ia64/uv/uv_mmrs.h 2008-07-02 14:18:09.000000000 -0500 @@ -11,11 +11,284 @@ #ifndef __ASM_IA64_UV_MMRS__ @@ -16,9 +17,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h +#define UV_MMR_ENABLE (1UL << 63) - #define UV_MMR_ENABLE (1UL << 63) -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_BAU_DATA_CONFIG */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_BAU_DATA_CONFIG 0x61680UL +#define UVH_BAU_DATA_CONFIG_32 0x0438 + @@ -55,9 +56,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_EVENT_OCCURRED0 */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_EVENT_OCCURRED0 0x70000UL +#define UVH_EVENT_OCCURRED0_32 0x005e8 + @@ -239,15 +240,15 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_EVENT_OCCURRED0_ALIAS */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_EVENT_OCCURRED0_ALIAS 0x0000000000070008UL +#define UVH_EVENT_OCCURRED0_ALIAS_32 0x005f0 + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_INT_CMPB */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_INT_CMPB 0x22080UL + +#define UVH_INT_CMPB_REAL_TIME_CMPB_SHFT 0 @@ -261,9 +262,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_INT_CMPC */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_INT_CMPC 0x22100UL + +#define UVH_INT_CMPC_REAL_TIME_CMPC_SHFT 0 @@ -277,9 +278,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_INT_CMPD */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_INT_CMPD 0x22180UL + +#define UVH_INT_CMPD_REAL_TIME_CMPD_SHFT 0 @@ -293,7 +294,7 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; - /* ===================================== */ + /* ========================================================================= */ /* UVH_NODE_ID */ @@ -111,8 +384,8 @@ union uvh_rh_gam_alias210_redirect_confi @@ -318,9 +319,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h unsigned long rsvd_56_62: 7; /* */ unsigned long enable : 1; /* RW */ @@ -157,7 +431,7 @@ union uvh_rh_gam_mmr_overlay_config_mmr_ - /* ===================================== */ + /* ========================================================================= */ /* UVH_RTC */ - /* ===================================== */ + /* ========================================================================= */ -#define UVH_RTC 0x28000UL +#define UVH_RTC 0x340000UL @@ -329,9 +330,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h @@ -171,6 +445,139 @@ union uvh_rtc_u { }; - /* ===================================== */ + /* ========================================================================= */ +/* UVH_RTC1_INT_CONFIG */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_RTC1_INT_CONFIG 0x615c0UL + +#define UVH_RTC1_INT_CONFIG_VECTOR_SHFT 0 @@ -367,9 +368,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_RTC2_INT_CONFIG */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_RTC2_INT_CONFIG 0x61600UL + +#define UVH_RTC2_INT_CONFIG_VECTOR_SHFT 0 @@ -405,9 +406,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_RTC3_INT_CONFIG */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_RTC3_INT_CONFIG 0x61640UL + +#define UVH_RTC3_INT_CONFIG_VECTOR_SHFT 0 @@ -443,9 +444,9 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ +/* UVH_RTC_INC_RATIO */ -+/* ===================================== */ ++/* ========================================================================= */ +#define UVH_RTC_INC_RATIO 0x350000UL + +#define UVH_RTC_INC_RATIO_FRACTION_SHFT 0 @@ -462,7 +463,7 @@ Index: linux/include/asm-ia64/uv/uv_mmrs.h + } s; +}; + -+/* ===================================== */ ++/* ========================================================================= */ /* UVH_SI_ADDR_MAP_CONFIG */ - /* ===================================== */ + /* ========================================================================= */ #define UVH_SI_ADDR_MAP_CONFIG 0xc80000UL diff --git a/a/content_digest b/N1/content_digest index e482ed8..b3bf947 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dimitri Sivanich <sivanich@sgi.com>\0" "Subject\0[PATCH] Update ia64 mmr list for SGI uv\0" - "Date\0Wed, 02 Jul 2008 20:47:55 +0000\0" + "Date\0Wed, 2 Jul 2008 15:47:55 -0500\0" "To\0Tony Luck <tony.luck@gmail.com>" " linux-ia64@vger.kernel.org\0" "Cc\0linux-kernel@vger.kernel.org" @@ -14,7 +14,8 @@ "\n" "\n" "Index: linux/include/asm-ia64/uv/uv_mmrs.h\n" - "=================================--- linux.orig/include/asm-ia64/uv/uv_mmrs.h\t2008-07-02 14:15:39.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/include/asm-ia64/uv/uv_mmrs.h\t2008-07-02 14:15:39.000000000 -0500\n" "+++ linux/include/asm-ia64/uv/uv_mmrs.h\t2008-07-02 14:18:09.000000000 -0500\n" "@@ -11,11 +11,284 @@\n" " #ifndef __ASM_IA64_UV_MMRS__\n" @@ -26,9 +27,9 @@ "+#define UV_MMR_ENABLE\t\t(1UL << 63)\n" " \n" "- #define UV_MMR_ENABLE\t\t(1UL << 63)\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_BAU_DATA_CONFIG */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_BAU_DATA_CONFIG 0x61680UL\n" "+#define UVH_BAU_DATA_CONFIG_32 0x0438\n" "+\n" @@ -65,9 +66,9 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_EVENT_OCCURRED0 */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_EVENT_OCCURRED0 0x70000UL\n" "+#define UVH_EVENT_OCCURRED0_32 0x005e8\n" "+\n" @@ -249,15 +250,15 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_EVENT_OCCURRED0_ALIAS */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_EVENT_OCCURRED0_ALIAS 0x0000000000070008UL\n" "+#define UVH_EVENT_OCCURRED0_ALIAS_32 0x005f0\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_INT_CMPB */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_INT_CMPB 0x22080UL\n" "+\n" "+#define UVH_INT_CMPB_REAL_TIME_CMPB_SHFT 0\n" @@ -271,9 +272,9 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_INT_CMPC */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_INT_CMPC 0x22100UL\n" "+\n" "+#define UVH_INT_CMPC_REAL_TIME_CMPC_SHFT 0\n" @@ -287,9 +288,9 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_INT_CMPD */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_INT_CMPD 0x22180UL\n" "+\n" "+#define UVH_INT_CMPD_REAL_TIME_CMPD_SHFT 0\n" @@ -303,7 +304,7 @@ "+ } s;\n" "+};\n" " \n" - " /* ===================================== */\n" + " /* ========================================================================= */\n" " /* UVH_NODE_ID */\n" "@@ -111,8 +384,8 @@ union uvh_rh_gam_alias210_redirect_confi\n" " \n" @@ -328,9 +329,9 @@ " \tunsigned long\trsvd_56_62: 7; /* */\n" " \tunsigned long\tenable : 1; /* RW */\n" "@@ -157,7 +431,7 @@ union uvh_rh_gam_mmr_overlay_config_mmr_\n" - " /* ===================================== */\n" + " /* ========================================================================= */\n" " /* UVH_RTC */\n" - " /* ===================================== */\n" + " /* ========================================================================= */\n" "-#define UVH_RTC 0x28000UL\n" "+#define UVH_RTC 0x340000UL\n" " \n" @@ -339,9 +340,9 @@ "@@ -171,6 +445,139 @@ union uvh_rtc_u {\n" " };\n" " \n" - " /* ===================================== */\n" + " /* ========================================================================= */\n" "+/* UVH_RTC1_INT_CONFIG */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_RTC1_INT_CONFIG 0x615c0UL\n" "+\n" "+#define UVH_RTC1_INT_CONFIG_VECTOR_SHFT 0\n" @@ -377,9 +378,9 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_RTC2_INT_CONFIG */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_RTC2_INT_CONFIG 0x61600UL\n" "+\n" "+#define UVH_RTC2_INT_CONFIG_VECTOR_SHFT 0\n" @@ -415,9 +416,9 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_RTC3_INT_CONFIG */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_RTC3_INT_CONFIG 0x61640UL\n" "+\n" "+#define UVH_RTC3_INT_CONFIG_VECTOR_SHFT 0\n" @@ -453,9 +454,9 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+/* UVH_RTC_INC_RATIO */\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" "+#define UVH_RTC_INC_RATIO 0x350000UL\n" "+\n" "+#define UVH_RTC_INC_RATIO_FRACTION_SHFT 0\n" @@ -472,9 +473,9 @@ "+ } s;\n" "+};\n" "+\n" - "+/* ===================================== */\n" + "+/* ========================================================================= */\n" " /* UVH_SI_ADDR_MAP_CONFIG */\n" - " /* ===================================== */\n" + " /* ========================================================================= */\n" #define UVH_SI_ADDR_MAP_CONFIG 0xc80000UL -7a22ad7aa10ffc8a1998fb00bb01eb3e3eac9ec5ce1e261fbda88f4096424f21 +6a7d270195fa0613021664f07d7313ed16029dd878e6a87133119193f0825bdb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.