diff for duplicates of <4153B49E.1060403@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index ae7d21c..d43f3b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,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> --- @@ -117,7 +117,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; @@ -576,6 +574,7 @@ iosapic_register_intr (unsigned int gsi, { @@ -137,7 +137,7 @@ diff -puN arch/ia64/kernel/iosapic.c~IRQ_deallocation_ia64 arch/ia64/kernel/iosa spin_unlock_irqrestore(&iosapic_lock, flags); @@ -592,10 +593,73 @@ 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); @@ -202,8 +202,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_IA64_DEALLOCATE_IRQ */ @@ -218,9 +218,9 @@ diff -puN arch/ia64/kernel/irq.c~IRQ_deallocation_ia64 arch/ia64/kernel/irq.c struct irqaction *old, **p; irq_desc_t *desc = irq_descp(irq); -- if (desc->handler == &no_irq_type) +- if (desc->handler = &no_irq_type) + spin_lock_irqsave(&desc->lock,flags); -+ if (desc->handler == &no_irq_type) { ++ if (desc->handler = &no_irq_type) { + spin_unlock_irqrestore(&desc->lock,flags); return -ENOSYS; + } @@ -342,11 +342,3 @@ diff -puN include/asm-ia64/iosapic.h~IRQ_deallocation_ia64 include/asm-ia64/iosa polarity,trigger) (gsi) _ - - - -------------------------------------------------------- -This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170 -Project Admins to receive an Apple iPod Mini FREE for your judgement on -who ports your project to Linux PPC the best. Sponsored by IBM. -Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php diff --git a/a/content_digest b/N1/content_digest index 06056c5..5799ec8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,7 @@ - "From\0Kenji Kaneshige <kaneshige.kenji-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\0" + "ref\04153B472.5020109@jp.fujitsu.com\0" + "From\0Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\0" "Subject\0[PATCH] Updated patches for PCI IRQ resource deallocation support [3/3]\0" - "Date\0Fri, 24 Sep 2004 14:46:06 +0900\0" + "Date\0Fri, 24 Sep 2004 05:46:06 +0000\0" "To\0greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org" len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org " tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org\0" @@ -39,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" @@ -129,7 +130,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" "@@ -576,6 +574,7 @@ iosapic_register_intr (unsigned int gsi,\n" " \t{\n" @@ -149,7 +150,7 @@ " \tspin_unlock_irqrestore(&iosapic_lock, flags);\n" " \n" "@@ -592,10 +593,73 @@ 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" @@ -214,8 +215,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_IA64_DEALLOCATE_IRQ */\n" @@ -230,9 +231,9 @@ " \tstruct irqaction *old, **p;\n" " \tirq_desc_t *desc = irq_descp(irq);\n" " \n" - "-\tif (desc->handler == &no_irq_type)\n" + "-\tif (desc->handler = &no_irq_type)\n" "+\tspin_lock_irqsave(&desc->lock,flags);\n" - "+\tif (desc->handler == &no_irq_type) {\n" + "+\tif (desc->handler = &no_irq_type) {\n" "+\t\tspin_unlock_irqrestore(&desc->lock,flags);\n" " \t\treturn -ENOSYS;\n" "+\t}\n" @@ -353,14 +354,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" - "This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170\n" - "Project Admins to receive an Apple iPod Mini FREE for your judgement on\n" - "who ports your project to Linux PPC the best. Sponsored by IBM.\n" - Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php + _ -d6efd35279c50e5288f5cf1a7564aa9d7422117d10336ffe0384db341fa4ae48 +945205e8a3f3e7c07c5cf5578c750204f49059cf0c0584d46e5694189bf581a4
diff --git a/a/1.txt b/N2/1.txt index ae7d21c..d98bd7b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,7 +27,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> --- @@ -342,11 +342,3 @@ diff -puN include/asm-ia64/iosapic.h~IRQ_deallocation_ia64 include/asm-ia64/iosa polarity,trigger) (gsi) _ - - - -------------------------------------------------------- -This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170 -Project Admins to receive an Apple iPod Mini FREE for your judgement on -who ports your project to Linux PPC the best. Sponsored by IBM. -Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php diff --git a/a/content_digest b/N2/content_digest index 06056c5..b7b1922 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] Updated patches for PCI IRQ resource deallocation support [3/3]\0" "Date\0Fri, 24 Sep 2004 14:46:06 +0900\0" - "To\0greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org" - len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org - " tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org\0" - "Cc\0akpm-3NddpPZAyC0@public.gmane.org" - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org - " linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0greg@kroah.com" + len.brown@intel.com + " tony.luck@intel.com\0" + "Cc\0akpm@osdl.org" + linux-kernel@vger.kernel.org + acpi-devel@lists.sourceforge.net + " linux-ia64@vger.kernel.org\0" "\00:1\0" "b\0" "This is a patch for ia64 code that depends on previous two patches.\n" @@ -39,7 +39,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" @@ -353,14 +353,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" - "This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170\n" - "Project Admins to receive an Apple iPod Mini FREE for your judgement on\n" - "who ports your project to Linux PPC the best. Sponsored by IBM.\n" - Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php + _ -d6efd35279c50e5288f5cf1a7564aa9d7422117d10336ffe0384db341fa4ae48 +3816d9500a88953158c9c6973eeb6333bc48f6441c19c291faa1964ca462e7d7
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.