diff for duplicates of <20060320193638.GH31238@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 4957561..8cd0ccf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ Clean up msi platform defintions in machvec.h (thanks to j-nomura@ce.jp.nec.com Signed-off-by: Mark Maule <maule@sgi.com> Index: maule/arch/ia64/sn/pci/Makefile -=================================--- maule.orig/arch/ia64/sn/pci/Makefile 2006-03-20 11:07:30.602099680 -0600 +=================================================================== +--- maule.orig/arch/ia64/sn/pci/Makefile 2006-03-20 11:07:30.602099680 -0600 +++ maule/arch/ia64/sn/pci/Makefile 2006-03-20 11:08:08.130604825 -0600 @@ -10,4 +10,3 @@ CPPFLAGS += -I$(srctree)/arch/ia64/sn/include @@ -17,7 +18,8 @@ Index: maule/arch/ia64/sn/pci/Makefile obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/ -obj-$(CONFIG_PCI_MSI) += msi.o Index: maule/arch/ia64/sn/pci/msi.c -=================================--- maule.orig/arch/ia64/sn/pci/msi.c 2006-03-20 11:07:30.602099680 -0600 +=================================================================== +--- maule.orig/arch/ia64/sn/pci/msi.c 2006-03-20 11:07:30.602099680 -0600 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,210 +0,0 @@ -/* @@ -59,7 +61,7 @@ Index: maule/arch/ia64/sn/pci/msi.c - struct sn_pcibus_provider *provider; - - sn_irq_info = sn_msi_info[vector].sn_irq_info; -- if (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0) +- if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0) - return; - - sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; @@ -95,10 +97,10 @@ Index: maule/arch/ia64/sn/pci/msi.c - struct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev); - struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev); - -- if (bussoft = NULL) +- if (bussoft == NULL) - return -EINVAL; - -- if (provider = NULL || provider->dma_map_consistent = NULL) +- if (provider == NULL || provider->dma_map_consistent == NULL) - return -EINVAL; - - /* @@ -174,7 +176,7 @@ Index: maule/arch/ia64/sn/pci/msi.c - struct sn_pcibus_provider *provider; - - sn_irq_info = sn_msi_info[vector].sn_irq_info; -- if (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0) +- if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0) - return; - - /* @@ -194,7 +196,7 @@ Index: maule/arch/ia64/sn/pci/msi.c - - new_irq_info = sn_retarget_vector(sn_irq_info, nasid, slice); - sn_msi_info[vector].sn_irq_info = new_irq_info; -- if (new_irq_info = NULL) +- if (new_irq_info == NULL) - return; - - /* @@ -222,7 +224,8 @@ Index: maule/arch/ia64/sn/pci/msi.c -int -sn_msi_init(void) -{ -- sn_msi_info - kzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL); +- sn_msi_info = +- kzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL); - if (! sn_msi_info) - return -ENOMEM; - @@ -230,7 +233,8 @@ Index: maule/arch/ia64/sn/pci/msi.c - return 0; -} Index: maule/drivers/pci/Makefile -=================================--- maule.orig/drivers/pci/Makefile 2006-03-20 11:07:30.602099680 -0600 +=================================================================== +--- maule.orig/drivers/pci/Makefile 2006-03-20 11:07:30.602099680 -0600 +++ maule/drivers/pci/Makefile 2006-03-20 11:08:08.130604825 -0600 @@ -26,7 +26,19 @@ obj-$(CONFIG_PPC64) += setup-bus.o @@ -254,7 +258,8 @@ Index: maule/drivers/pci/Makefile # # ACPI Related PCI FW Functions Index: maule/drivers/pci/msi-altix.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ maule/drivers/pci/msi-altix.c 2006-03-20 11:30:42.572360932 -0600 @@ -0,0 +1,210 @@ +/* @@ -296,7 +301,7 @@ Index: maule/drivers/pci/msi-altix.c + struct sn_pcibus_provider *provider; + + sn_irq_info = sn_msi_info[vector].sn_irq_info; -+ if (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0) ++ if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0) + return; + + sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; @@ -332,10 +337,10 @@ Index: maule/drivers/pci/msi-altix.c + struct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev); + struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev); + -+ if (bussoft = NULL) ++ if (bussoft == NULL) + return -EINVAL; + -+ if (provider = NULL || provider->dma_map_consistent = NULL) ++ if (provider == NULL || provider->dma_map_consistent == NULL) + return -EINVAL; + + /* @@ -411,7 +416,7 @@ Index: maule/drivers/pci/msi-altix.c + struct sn_pcibus_provider *provider; + + sn_irq_info = sn_msi_info[vector].sn_irq_info; -+ if (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0) ++ if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0) + return; + + /* @@ -431,7 +436,7 @@ Index: maule/drivers/pci/msi-altix.c + + new_irq_info = sn_retarget_vector(sn_irq_info, nasid, slice); + sn_msi_info[vector].sn_irq_info = new_irq_info; -+ if (new_irq_info = NULL) ++ if (new_irq_info == NULL) + return; + + /* @@ -459,7 +464,8 @@ Index: maule/drivers/pci/msi-altix.c +int +sn_msi_init(void) +{ -+ sn_msi_info + kzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL); ++ sn_msi_info = ++ kzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL); + if (! sn_msi_info) + return -ENOMEM; + @@ -467,7 +473,8 @@ Index: maule/drivers/pci/msi-altix.c + return 0; +} Index: maule/drivers/pci/msi.h -=================================--- maule.orig/drivers/pci/msi.h 2006-03-17 15:56:47.985483772 -0600 +=================================================================== +--- maule.orig/drivers/pci/msi.h 2006-03-17 15:56:47.985483772 -0600 +++ maule/drivers/pci/msi.h 2006-03-20 12:08:49.730770784 -0600 @@ -6,6 +6,65 @@ #ifndef MSI_H @@ -598,7 +605,8 @@ Index: maule/drivers/pci/msi.h - #endif /* MSI_H */ Index: maule/drivers/pci/pci.h -=================================--- maule.orig/drivers/pci/pci.h 2006-03-17 15:56:47.989484242 -0600 +=================================================================== +--- maule.orig/drivers/pci/pci.h 2006-03-17 15:56:47.989484242 -0600 +++ maule/drivers/pci/pci.h 2006-03-20 11:29:45.621538709 -0600 @@ -51,11 +51,9 @@ struct msi_ops; @@ -613,7 +621,8 @@ Index: maule/drivers/pci/pci.h #endif Index: maule/include/asm-ia64/machvec.h -=================================--- maule.orig/include/asm-ia64/machvec.h 2006-03-17 15:56:50.153738431 -0600 +=================================================================== +--- maule.orig/include/asm-ia64/machvec.h 2006-03-17 15:56:50.153738431 -0600 +++ maule/include/asm-ia64/machvec.h 2006-03-20 11:41:25.865449097 -0600 @@ -404,12 +404,7 @@ # define platform_migrate machvec_noop_task @@ -629,7 +638,8 @@ Index: maule/include/asm-ia64/machvec.h #endif /* _ASM_IA64_MACHVEC_H */ Index: maule/include/asm-ia64/msi.h -=================================--- maule.orig/include/asm-ia64/msi.h 2006-03-20 11:30:18.137433515 -0600 +=================================================================== +--- maule.orig/include/asm-ia64/msi.h 2006-03-20 11:30:18.137433515 -0600 +++ maule/include/asm-ia64/msi.h 2006-03-20 12:06:40.671281126 -0600 @@ -16,13 +16,14 @@ diff --git a/a/content_digest b/N1/content_digest index a9dcd4c..851bc06 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Mark Maule <maule@sgi.com>\0" "Subject\0[PATCH 2.6.16-rc6-mm1] fix ia64 MSI build problems\0" - "Date\0Mon, 20 Mar 2006 19:36:38 +0000\0" + "Date\0Mon, 20 Mar 2006 13:36:38 -0600\0" "To\0linux-kernel@vger.kernel.org" " linux-ia64@vger.kernel.org\0" "Cc\0gregkh@suse.de" @@ -19,7 +19,8 @@ "Signed-off-by: Mark Maule <maule@sgi.com>\n" "\n" "Index: maule/arch/ia64/sn/pci/Makefile\n" - "=================================--- maule.orig/arch/ia64/sn/pci/Makefile\t2006-03-20 11:07:30.602099680 -0600\n" + "===================================================================\n" + "--- maule.orig/arch/ia64/sn/pci/Makefile\t2006-03-20 11:07:30.602099680 -0600\n" "+++ maule/arch/ia64/sn/pci/Makefile\t2006-03-20 11:08:08.130604825 -0600\n" "@@ -10,4 +10,3 @@\n" " CPPFLAGS += -I$(srctree)/arch/ia64/sn/include\n" @@ -27,7 +28,8 @@ " obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/\n" "-obj-$(CONFIG_PCI_MSI) += msi.o\n" "Index: maule/arch/ia64/sn/pci/msi.c\n" - "=================================--- maule.orig/arch/ia64/sn/pci/msi.c\t2006-03-20 11:07:30.602099680 -0600\n" + "===================================================================\n" + "--- maule.orig/arch/ia64/sn/pci/msi.c\t2006-03-20 11:07:30.602099680 -0600\n" "+++ /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "@@ -1,210 +0,0 @@\n" "-/*\n" @@ -69,7 +71,7 @@ "-\tstruct sn_pcibus_provider *provider;\n" "-\n" "-\tsn_irq_info = sn_msi_info[vector].sn_irq_info;\n" - "-\tif (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0)\n" + "-\tif (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)\n" "-\t\treturn;\n" "-\n" "-\tsn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;\n" @@ -105,10 +107,10 @@ "-\tstruct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev);\n" "-\tstruct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);\n" "-\n" - "-\tif (bussoft = NULL)\n" + "-\tif (bussoft == NULL)\n" "-\t\treturn -EINVAL;\n" "-\n" - "-\tif (provider = NULL || provider->dma_map_consistent = NULL)\n" + "-\tif (provider == NULL || provider->dma_map_consistent == NULL)\n" "-\t\treturn -EINVAL;\n" "-\n" "-\t/*\n" @@ -184,7 +186,7 @@ "-\tstruct sn_pcibus_provider *provider;\n" "-\n" "-\tsn_irq_info = sn_msi_info[vector].sn_irq_info;\n" - "-\tif (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0)\n" + "-\tif (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)\n" "-\t\treturn;\n" "-\n" "-\t/*\n" @@ -204,7 +206,7 @@ "-\n" "-\tnew_irq_info = sn_retarget_vector(sn_irq_info, nasid, slice);\n" "-\tsn_msi_info[vector].sn_irq_info = new_irq_info;\n" - "-\tif (new_irq_info = NULL)\n" + "-\tif (new_irq_info == NULL)\n" "-\t\treturn;\n" "-\n" "-\t/*\n" @@ -232,7 +234,8 @@ "-int\n" "-sn_msi_init(void)\n" "-{\n" - "-\tsn_msi_info -\t\tkzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL);\n" + "-\tsn_msi_info =\n" + "-\t\tkzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL);\n" "-\tif (! sn_msi_info)\n" "-\t\treturn -ENOMEM;\n" "-\n" @@ -240,7 +243,8 @@ "-\treturn 0;\n" "-}\n" "Index: maule/drivers/pci/Makefile\n" - "=================================--- maule.orig/drivers/pci/Makefile\t2006-03-20 11:07:30.602099680 -0600\n" + "===================================================================\n" + "--- maule.orig/drivers/pci/Makefile\t2006-03-20 11:07:30.602099680 -0600\n" "+++ maule/drivers/pci/Makefile\t2006-03-20 11:08:08.130604825 -0600\n" "@@ -26,7 +26,19 @@\n" " obj-$(CONFIG_PPC64) += setup-bus.o\n" @@ -264,7 +268,8 @@ " #\n" " # ACPI Related PCI FW Functions\n" "Index: maule/drivers/pci/msi-altix.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ maule/drivers/pci/msi-altix.c\t2006-03-20 11:30:42.572360932 -0600\n" "@@ -0,0 +1,210 @@\n" "+/*\n" @@ -306,7 +311,7 @@ "+\tstruct sn_pcibus_provider *provider;\n" "+\n" "+\tsn_irq_info = sn_msi_info[vector].sn_irq_info;\n" - "+\tif (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0)\n" + "+\tif (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)\n" "+\t\treturn;\n" "+\n" "+\tsn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;\n" @@ -342,10 +347,10 @@ "+\tstruct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev);\n" "+\tstruct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);\n" "+\n" - "+\tif (bussoft = NULL)\n" + "+\tif (bussoft == NULL)\n" "+\t\treturn -EINVAL;\n" "+\n" - "+\tif (provider = NULL || provider->dma_map_consistent = NULL)\n" + "+\tif (provider == NULL || provider->dma_map_consistent == NULL)\n" "+\t\treturn -EINVAL;\n" "+\n" "+\t/*\n" @@ -421,7 +426,7 @@ "+\tstruct sn_pcibus_provider *provider;\n" "+\n" "+\tsn_irq_info = sn_msi_info[vector].sn_irq_info;\n" - "+\tif (sn_irq_info = NULL || sn_irq_info->irq_int_bit >= 0)\n" + "+\tif (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)\n" "+\t\treturn;\n" "+\n" "+\t/*\n" @@ -441,7 +446,7 @@ "+\n" "+\tnew_irq_info = sn_retarget_vector(sn_irq_info, nasid, slice);\n" "+\tsn_msi_info[vector].sn_irq_info = new_irq_info;\n" - "+\tif (new_irq_info = NULL)\n" + "+\tif (new_irq_info == NULL)\n" "+\t\treturn;\n" "+\n" "+\t/*\n" @@ -469,7 +474,8 @@ "+int\n" "+sn_msi_init(void)\n" "+{\n" - "+\tsn_msi_info +\t\tkzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL);\n" + "+\tsn_msi_info =\n" + "+\t\tkzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL);\n" "+\tif (! sn_msi_info)\n" "+\t\treturn -ENOMEM;\n" "+\n" @@ -477,7 +483,8 @@ "+\treturn 0;\n" "+}\n" "Index: maule/drivers/pci/msi.h\n" - "=================================--- maule.orig/drivers/pci/msi.h\t2006-03-17 15:56:47.985483772 -0600\n" + "===================================================================\n" + "--- maule.orig/drivers/pci/msi.h\t2006-03-17 15:56:47.985483772 -0600\n" "+++ maule/drivers/pci/msi.h\t2006-03-20 12:08:49.730770784 -0600\n" "@@ -6,6 +6,65 @@\n" " #ifndef MSI_H\n" @@ -608,7 +615,8 @@ "-\n" " #endif /* MSI_H */\n" "Index: maule/drivers/pci/pci.h\n" - "=================================--- maule.orig/drivers/pci/pci.h\t2006-03-17 15:56:47.989484242 -0600\n" + "===================================================================\n" + "--- maule.orig/drivers/pci/pci.h\t2006-03-17 15:56:47.989484242 -0600\n" "+++ maule/drivers/pci/pci.h\t2006-03-20 11:29:45.621538709 -0600\n" "@@ -51,11 +51,9 @@\n" " struct msi_ops;\n" @@ -623,7 +631,8 @@ " #endif\n" " \n" "Index: maule/include/asm-ia64/machvec.h\n" - "=================================--- maule.orig/include/asm-ia64/machvec.h\t2006-03-17 15:56:50.153738431 -0600\n" + "===================================================================\n" + "--- maule.orig/include/asm-ia64/machvec.h\t2006-03-17 15:56:50.153738431 -0600\n" "+++ maule/include/asm-ia64/machvec.h\t2006-03-20 11:41:25.865449097 -0600\n" "@@ -404,12 +404,7 @@\n" " # define platform_migrate machvec_noop_task\n" @@ -639,7 +648,8 @@ " \n" " #endif /* _ASM_IA64_MACHVEC_H */\n" "Index: maule/include/asm-ia64/msi.h\n" - "=================================--- maule.orig/include/asm-ia64/msi.h\t2006-03-20 11:30:18.137433515 -0600\n" + "===================================================================\n" + "--- maule.orig/include/asm-ia64/msi.h\t2006-03-20 11:30:18.137433515 -0600\n" "+++ maule/include/asm-ia64/msi.h\t2006-03-20 12:06:40.671281126 -0600\n" "@@ -16,13 +16,14 @@\n" " \n" @@ -661,4 +671,4 @@ "-\n" #endif /* ASM_MSI_H */ -1628d18371c350a2923526465e4a5adb22ffe5a795f89c2fa1e914014cf75ec5 +004d4e0211b3e573b6e470831eacb63dfa3ab3a7c7cdef4e240d7e5f97b15b1e
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.