diff for duplicates of <1106691248.13055.59.camel@tdi> diff --git a/a/1.txt b/N1/1.txt index a2b0c9f..db39b75 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,8 +39,7 @@ Alex Williamson HP Linux & Open Source Lab include/asm-ia64/machvec_hpzx1_swiotlb.h | 4 6 files changed, 422 insertions(+), 103 deletions(-) -===== arch/ia64/Kconfig 1.84 vs edited ===== ---- 1.84/arch/ia64/Kconfig 2005-01-18 13:06:17 -07:00 +=== arch/ia64/Kconfig 1.84 vs edited ==--- 1.84/arch/ia64/Kconfig 2005-01-18 13:06:17 -07:00 +++ edited/arch/ia64/Kconfig 2005-01-25 10:48:41 -07:00 @@ -360,6 +360,11 @@ depends on !IA64_HP_SIM @@ -54,8 +53,7 @@ Alex Williamson HP Linux & Open Source Lab if !IA64_HP_SIM source "drivers/acpi/Kconfig" -===== arch/ia64/hp/common/sba_iommu.c 1.50 vs edited ===== ---- 1.50/arch/ia64/hp/common/sba_iommu.c 2005-01-11 17:10:37 -07:00 +=== arch/ia64/hp/common/sba_iommu.c 1.50 vs edited ==--- 1.50/arch/ia64/hp/common/sba_iommu.c 2005-01-11 17:10:37 -07:00 +++ edited/arch/ia64/hp/common/sba_iommu.c 2005-01-25 11:19:44 -07:00 @@ -2052,6 +2052,21 @@ @@ -120,8 +118,7 @@ Alex Williamson HP Linux & Open Source Lab dig_setup(cmdline_p); } -===== drivers/acpi/osl.c 1.64 vs edited ===== ---- 1.64/drivers/acpi/osl.c 2004-12-23 06:09:11 -07:00 +=== drivers/acpi/osl.c 1.64 vs edited ==--- 1.64/drivers/acpi/osl.c 2004-12-23 06:09:11 -07:00 +++ edited/drivers/acpi/osl.c 2005-01-25 10:41:58 -07:00 @@ -25,6 +25,7 @@ * @@ -623,11 +620,10 @@ Alex Williamson HP Linux & Open Source Lab void acpi_os_wait_events_complete( -===== drivers/acpi/events/evxfevnt.c 1.25 vs edited ===== ---- 1.25/drivers/acpi/events/evxfevnt.c 2004-12-05 22:09:54 -07:00 +=== drivers/acpi/events/evxfevnt.c 1.25 vs edited ==--- 1.25/drivers/acpi/events/evxfevnt.c 2004-12-05 22:09:54 -07:00 +++ edited/drivers/acpi/events/evxfevnt.c 2005-01-24 16:49:11 -07:00 @@ -127,7 +127,7 @@ - if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) { + if (acpi_hw_get_mode() = ACPI_SYS_MODE_LEGACY) { ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "System is already in legacy (non-ACPI) mode\n")); } - else { @@ -635,8 +631,7 @@ Alex Williamson HP Linux & Open Source Lab /* Transition to LEGACY mode */ status = acpi_hw_set_mode (ACPI_SYS_MODE_LEGACY); -===== include/acpi/acpiosxf.h 1.38 vs edited ===== ---- 1.38/include/acpi/acpiosxf.h 2004-11-11 23:29:47 -07:00 +=== include/acpi/acpiosxf.h 1.38 vs edited ==--- 1.38/include/acpi/acpiosxf.h 2004-11-11 23:29:47 -07:00 +++ edited/include/acpi/acpiosxf.h 2005-01-25 08:57:03 -07:00 @@ -385,5 +385,16 @@ u32 line_number, @@ -655,8 +650,7 @@ Alex Williamson HP Linux & Open Source Lab +#endif /* CONFIG_ACPI_EARLY_BOOT */ #endif /* __ACPIOSXF_H__ */ -===== include/asm-ia64/machvec_hpzx1_swiotlb.h 1.1 vs edited ===== ---- 1.1/include/asm-ia64/machvec_hpzx1_swiotlb.h 2005-01-12 10:10:35 -07:00 +=== include/asm-ia64/machvec_hpzx1_swiotlb.h 1.1 vs edited ==--- 1.1/include/asm-ia64/machvec_hpzx1_swiotlb.h 2005-01-12 10:10:35 -07:00 +++ edited/include/asm-ia64/machvec_hpzx1_swiotlb.h 2005-01-25 10:44:28 -07:00 @@ -1,7 +1,7 @@ #ifndef _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h diff --git a/a/content_digest b/N1/content_digest index 27882dd..02a574b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Alex Williamson <alex.williamson@hp.com>\0" "Subject\0[RFC] Early ACPI init\0" - "Date\0Tue, 25 Jan 2005 15:14:07 -0700\0" + "Date\0Tue, 25 Jan 2005 22:14:07 +0000\0" "To\0acpi-devel <acpi-devel@lists.sourceforge.net>\0" "Cc\0linux-ia64@vger.kernel.org\0" "\00:1\0" @@ -46,8 +46,7 @@ " include/asm-ia64/machvec_hpzx1_swiotlb.h | 4 \n" " 6 files changed, 422 insertions(+), 103 deletions(-)\n" "\n" - "===== arch/ia64/Kconfig 1.84 vs edited =====\n" - "--- 1.84/arch/ia64/Kconfig\t2005-01-18 13:06:17 -07:00\n" + "=== arch/ia64/Kconfig 1.84 vs edited ==--- 1.84/arch/ia64/Kconfig\t2005-01-18 13:06:17 -07:00\n" "+++ edited/arch/ia64/Kconfig\t2005-01-25 10:48:41 -07:00\n" "@@ -360,6 +360,11 @@\n" " \tdepends on !IA64_HP_SIM\n" @@ -61,8 +60,7 @@ " if !IA64_HP_SIM\n" " \n" " source \"drivers/acpi/Kconfig\"\n" - "===== arch/ia64/hp/common/sba_iommu.c 1.50 vs edited =====\n" - "--- 1.50/arch/ia64/hp/common/sba_iommu.c\t2005-01-11 17:10:37 -07:00\n" + "=== arch/ia64/hp/common/sba_iommu.c 1.50 vs edited ==--- 1.50/arch/ia64/hp/common/sba_iommu.c\t2005-01-11 17:10:37 -07:00\n" "+++ edited/arch/ia64/hp/common/sba_iommu.c\t2005-01-25 11:19:44 -07:00\n" "@@ -2052,6 +2052,21 @@\n" " \n" @@ -127,8 +125,7 @@ " \tdig_setup(cmdline_p);\n" " }\n" " \n" - "===== drivers/acpi/osl.c 1.64 vs edited =====\n" - "--- 1.64/drivers/acpi/osl.c\t2004-12-23 06:09:11 -07:00\n" + "=== drivers/acpi/osl.c 1.64 vs edited ==--- 1.64/drivers/acpi/osl.c\t2004-12-23 06:09:11 -07:00\n" "+++ edited/drivers/acpi/osl.c\t2005-01-25 10:41:58 -07:00\n" "@@ -25,6 +25,7 @@\n" " *\n" @@ -630,11 +627,10 @@ " \n" " void\n" " acpi_os_wait_events_complete(\n" - "===== drivers/acpi/events/evxfevnt.c 1.25 vs edited =====\n" - "--- 1.25/drivers/acpi/events/evxfevnt.c\t2004-12-05 22:09:54 -07:00\n" + "=== drivers/acpi/events/evxfevnt.c 1.25 vs edited ==--- 1.25/drivers/acpi/events/evxfevnt.c\t2004-12-05 22:09:54 -07:00\n" "+++ edited/drivers/acpi/events/evxfevnt.c\t2005-01-24 16:49:11 -07:00\n" "@@ -127,7 +127,7 @@\n" - " \tif (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) {\n" + " \tif (acpi_hw_get_mode() = ACPI_SYS_MODE_LEGACY) {\n" " \t\tACPI_DEBUG_PRINT ((ACPI_DB_INIT, \"System is already in legacy (non-ACPI) mode\\n\"));\n" " \t}\n" "-\telse {\n" @@ -642,8 +638,7 @@ " \t\t/* Transition to LEGACY mode */\n" " \n" " \t\tstatus = acpi_hw_set_mode (ACPI_SYS_MODE_LEGACY);\n" - "===== include/acpi/acpiosxf.h 1.38 vs edited =====\n" - "--- 1.38/include/acpi/acpiosxf.h\t2004-11-11 23:29:47 -07:00\n" + "=== include/acpi/acpiosxf.h 1.38 vs edited ==--- 1.38/include/acpi/acpiosxf.h\t2004-11-11 23:29:47 -07:00\n" "+++ edited/include/acpi/acpiosxf.h\t2005-01-25 08:57:03 -07:00\n" "@@ -385,5 +385,16 @@\n" " \tu32 line_number,\n" @@ -662,8 +657,7 @@ "+#endif /* CONFIG_ACPI_EARLY_BOOT */\n" " \n" " #endif /* __ACPIOSXF_H__ */\n" - "===== include/asm-ia64/machvec_hpzx1_swiotlb.h 1.1 vs edited =====\n" - "--- 1.1/include/asm-ia64/machvec_hpzx1_swiotlb.h\t2005-01-12 10:10:35 -07:00\n" + "=== include/asm-ia64/machvec_hpzx1_swiotlb.h 1.1 vs edited ==--- 1.1/include/asm-ia64/machvec_hpzx1_swiotlb.h\t2005-01-12 10:10:35 -07:00\n" "+++ edited/include/asm-ia64/machvec_hpzx1_swiotlb.h\t2005-01-25 10:44:28 -07:00\n" "@@ -1,7 +1,7 @@\n" " #ifndef _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h\n" @@ -684,4 +678,4 @@ " #define platform_dma_alloc_coherent\t\thwsw_alloc_coherent\n" " #define platform_dma_free_coherent\t\thwsw_free_coherent" -74133e87c7f10fa6349f32c1dde7e849e415b49d148a88995f38ed85b1148d43 +04a868528d2df58c9b83ec7dd59ac148998fcbaaa25c352f4f2609b94ce8915d
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.