diff for duplicates of <41B559E6.5090601@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 4482dd4..cefa6d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,7 @@ pcibios_disable_device() and acpi_unregister_gsi() for ia64. This calls acpi_pci_irq_disable() to deallocate IRQ resources. -Signed-off-by: Kenji Kaneshige <kaneshige.kenji-+CUm20s59erQFUHtdCDX3A@public.gmane.org> +Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> --- @@ -124,7 +124,7 @@ diff -puN arch/ia64/kernel/iosapic.c~IRQ_deallocation_ia64 arch/ia64/kernel/iosa iosapic_intr_info[vector].trigger = trigger; + iosapic_intr_info[vector].refcnt++; - if (trigger == IOSAPIC_EDGE) + if (trigger = IOSAPIC_EDGE) irq_type = &irq_type_iosapic_edge; @@ -581,6 +579,7 @@ iosapic_register_intr (unsigned int gsi, { @@ -144,7 +144,7 @@ diff -puN arch/ia64/kernel/iosapic.c~IRQ_deallocation_ia64 arch/ia64/kernel/iosa spin_unlock_irqrestore(&iosapic_lock, flags); @@ -597,10 +598,87 @@ iosapic_register_intr (unsigned int gsi, - (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), + (polarity = IOSAPIC_POL_HIGH ? "high" : "low"), cpu_logical_id(dest), dest, vector); - set_rte(vector, dest, 1); @@ -223,8 +223,8 @@ diff -puN arch/ia64/kernel/iosapic.c~IRQ_deallocation_ia64 arch/ia64/kernel/iosa + free_irq_vector(vector); + + printk(KERN_INFO "GSI %u (%s, %s) -> vector %d unregisterd.\n", -+ gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), -+ (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), ++ gsi, (trigger = IOSAPIC_EDGE ? "edge" : "level"), ++ (polarity = IOSAPIC_POL_HIGH ? "high" : "low"), + vector); +} +#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */ @@ -347,11 +347,3 @@ diff -puN include/asm-ia64/iosapic.h~IRQ_deallocation_ia64 include/asm-ia64/iosa polarity,trigger) (gsi) _ - - - -------------------------------------------------------- -SF email is sponsored by - The IT Product Guide -Read honest & candid reviews on hundreds of IT Products from real users. -Discover which products truly live up to the hype. Start reading now. -http://productguide.itmanagersjournal.com/ diff --git a/a/content_digest b/N1/content_digest index 2217e9a..8c1dc5b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Kenji Kaneshige <kaneshige.kenji-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\0" + "From\0Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\0" "Subject\0[PATCH] IRQ resource deallocation [2/2]\0" - "Date\0Tue, 07 Dec 2004 16:21:10 +0900\0" + "Date\0Tue, 07 Dec 2004 07:21:10 +0000\0" "To\0Andrew Morton <akpm-3NddpPZAyC0@public.gmane.org>" Len Brown <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Luck @@ -40,7 +40,7 @@ "\n" " This calls acpi_pci_irq_disable() to deallocate IRQ resources.\n" "\n" - "Signed-off-by: Kenji Kaneshige <kaneshige.kenji-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\n" + "Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\n" "\n" "\n" "---\n" @@ -136,7 +136,7 @@ " \tiosapic_intr_info[vector].trigger = trigger;\n" "+\tiosapic_intr_info[vector].refcnt++;\n" " \n" - " \tif (trigger == IOSAPIC_EDGE)\n" + " \tif (trigger = IOSAPIC_EDGE)\n" " \t\tirq_type = &irq_type_iosapic_edge;\n" "@@ -581,6 +579,7 @@ iosapic_register_intr (unsigned int gsi,\n" " \t{\n" @@ -156,7 +156,7 @@ " \tspin_unlock_irqrestore(&iosapic_lock, flags);\n" " \n" "@@ -597,10 +598,87 @@ iosapic_register_intr (unsigned int gsi,\n" - " \t (polarity == IOSAPIC_POL_HIGH ? \"high\" : \"low\"),\n" + " \t (polarity = IOSAPIC_POL_HIGH ? \"high\" : \"low\"),\n" " \t cpu_logical_id(dest), dest, vector);\n" " \n" "-\tset_rte(vector, dest, 1);\n" @@ -235,8 +235,8 @@ "+\tfree_irq_vector(vector);\n" "+\n" "+\tprintk(KERN_INFO \"GSI %u (%s, %s) -> vector %d unregisterd.\\n\",\n" - "+\t gsi, (trigger == IOSAPIC_EDGE ? \"edge\" : \"level\"),\n" - "+\t (polarity == IOSAPIC_POL_HIGH ? \"high\" : \"low\"),\n" + "+\t gsi, (trigger = IOSAPIC_EDGE ? \"edge\" : \"level\"),\n" + "+\t (polarity = IOSAPIC_POL_HIGH ? \"high\" : \"low\"),\n" "+\t vector);\n" "+}\n" "+#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */\n" @@ -358,14 +358,6 @@ " #define iosapic_register_platform_intr(type,gsi,pmi,eid,id, \\\n" " \tpolarity,trigger)\t\t\t\t\t(gsi)\n" "\n" - "_\n" - "\n" - "\n" - "\n" - "-------------------------------------------------------\n" - "SF email is sponsored by - The IT Product Guide\n" - "Read honest & candid reviews on hundreds of IT Products from real users.\n" - "Discover which products truly live up to the hype. Start reading now. \n" - http://productguide.itmanagersjournal.com/ + _ -d08a99904c35761501817983329511be0d33919880125b3cc93ae2077a9e52c1 +95d5f6a8c742f59624df1bf106a24a02c15dac095221aeb87fb93391e70820bf
diff --git a/a/1.txt b/N2/1.txt index 4482dd4..87306ab 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -28,7 +28,7 @@ pcibios_disable_device() and acpi_unregister_gsi() for ia64. This calls acpi_pci_irq_disable() to deallocate IRQ resources. -Signed-off-by: Kenji Kaneshige <kaneshige.kenji-+CUm20s59erQFUHtdCDX3A@public.gmane.org> +Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> --- @@ -347,11 +347,3 @@ diff -puN include/asm-ia64/iosapic.h~IRQ_deallocation_ia64 include/asm-ia64/iosa polarity,trigger) (gsi) _ - - - -------------------------------------------------------- -SF email is sponsored by - The IT Product Guide -Read honest & candid reviews on hundreds of IT Products from real users. -Discover which products truly live up to the hype. Start reading now. -http://productguide.itmanagersjournal.com/ diff --git a/a/content_digest b/N2/content_digest index 2217e9a..0c139d4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,13 @@ - "From\0Kenji Kaneshige <kaneshige.kenji-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\0" + "From\0Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\0" "Subject\0[PATCH] IRQ resource deallocation [2/2]\0" "Date\0Tue, 07 Dec 2004 16:21:10 +0900\0" - "To\0Andrew Morton <akpm-3NddpPZAyC0@public.gmane.org>" - Len Brown <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> + "To\0Andrew Morton <akpm@osdl.org>" + Len Brown <len.brown@intel.com> Luck - " Tony <tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" - "Cc\0Linux Kernel Mailing List <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>" - linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org\0" + " Tony <tony.luck@intel.com>\0" + "Cc\0Linux Kernel Mailing List <linux-kernel@vger.kernel.org>" + linux-ia64@vger.kernel.org + " acpi-devel@lists.sourceforge.net\0" "\00:1\0" "b\0" "This patch is IA64 portion of IRQ resource deallocation.\n" @@ -40,7 +40,7 @@ "\n" " This calls acpi_pci_irq_disable() to deallocate IRQ resources.\n" "\n" - "Signed-off-by: Kenji Kaneshige <kaneshige.kenji-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\n" + "Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\n" "\n" "\n" "---\n" @@ -358,14 +358,6 @@ " #define iosapic_register_platform_intr(type,gsi,pmi,eid,id, \\\n" " \tpolarity,trigger)\t\t\t\t\t(gsi)\n" "\n" - "_\n" - "\n" - "\n" - "\n" - "-------------------------------------------------------\n" - "SF email is sponsored by - The IT Product Guide\n" - "Read honest & candid reviews on hundreds of IT Products from real users.\n" - "Discover which products truly live up to the hype. Start reading now. \n" - http://productguide.itmanagersjournal.com/ + _ -d08a99904c35761501817983329511be0d33919880125b3cc93ae2077a9e52c1 +c9bded69348bf5b7f484c023973039524638a63789e72f9d30bcbc202f04a4d0
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.