diff for duplicates of <200709202103.11316.lenb@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 1d2b1cd..fae6abf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,8 +19,7 @@ On Thursday 20 September 2007 16:22, Bjorn Helgaas wrote: > Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> > > Index: work2/arch/ia64/Kconfig -> =================================================================== -> --- work2.orig/arch/ia64/Kconfig 2007-09-19 10:09:43.000000000 -0600 +> =================================> --- work2.orig/arch/ia64/Kconfig 2007-09-19 10:09:43.000000000 -0600 > +++ work2/arch/ia64/Kconfig 2007-09-19 10:51:15.000000000 -0600 > @@ -461,6 +461,16 @@ > firmware extensions, such as the ability to inject memory-errors @@ -40,8 +39,7 @@ On Thursday 20 September 2007 16:22, Bjorn Helgaas wrote: > > config KEXEC > Index: work2/arch/ia64/hp/common/Makefile -> =================================================================== -> --- work2.orig/arch/ia64/hp/common/Makefile 2007-09-19 10:09:43.000000000 -0600 +> =================================> --- work2.orig/arch/ia64/hp/common/Makefile 2007-09-19 10:09:43.000000000 -0600 > +++ work2/arch/ia64/hp/common/Makefile 2007-09-19 10:51:15.000000000 -0600 > @@ -8,3 +8,4 @@ > obj-y := sba_iommu.o @@ -49,8 +47,7 @@ On Thursday 20 September 2007 16:22, Bjorn Helgaas wrote: > obj-$(CONFIG_IA64_GENERIC) += hwsw_iommu.o > +obj-$(CONFIG_IA64_HP_AML_NFW) += aml_nfw.o > Index: work2/arch/ia64/hp/common/aml_nfw.c -> =================================================================== -> --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +> =================================> --- /dev/null 1970-01-01 00:00:00.000000000 +0000 > +++ work2/arch/ia64/hp/common/aml_nfw.c 2007-09-20 14:05:21.000000000 -0600 > @@ -0,0 +1,236 @@ > +/* @@ -184,7 +181,7 @@ On Thursday 20 September 2007 16:22, Bjorn Helgaas wrote: > + > + switch (function) { > + case ACPI_READ: -> + if (address == offsetof(struct ia64_nfw_context, ret)) +> + if (address = offsetof(struct ia64_nfw_context, ret)) > + aml_nfw_execute(context); > + aml_nfw_read_arg(offset, bit_width, value); > + break; diff --git a/a/content_digest b/N1/content_digest index c2a87d9..000d8b5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0200709201422.03539.bjorn.helgaas@hp.com\0" "From\0Len Brown <lenb@kernel.org>\0" "Subject\0Re: [patch 2/2] ia64: add driver for ACPI methods to call native firmware\0" - "Date\0Thu, 20 Sep 2007 21:03:11 -0400\0" + "Date\0Fri, 21 Sep 2007 01:03:11 +0000\0" "To\0Bjorn Helgaas <bjorn.helgaas@hp.com>\0" "Cc\0linux-ia64@vger.kernel.org" Luck @@ -31,8 +31,7 @@ "> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>\n" "> \n" "> Index: work2/arch/ia64/Kconfig\n" - "> ===================================================================\n" - "> --- work2.orig/arch/ia64/Kconfig\t2007-09-19 10:09:43.000000000 -0600\n" + "> =================================> --- work2.orig/arch/ia64/Kconfig\t2007-09-19 10:09:43.000000000 -0600\n" "> +++ work2/arch/ia64/Kconfig\t2007-09-19 10:51:15.000000000 -0600\n" "> @@ -461,6 +461,16 @@\n" "> \t firmware extensions, such as the ability to inject memory-errors\n" @@ -52,8 +51,7 @@ "> \n" "> config KEXEC\n" "> Index: work2/arch/ia64/hp/common/Makefile\n" - "> ===================================================================\n" - "> --- work2.orig/arch/ia64/hp/common/Makefile\t2007-09-19 10:09:43.000000000 -0600\n" + "> =================================> --- work2.orig/arch/ia64/hp/common/Makefile\t2007-09-19 10:09:43.000000000 -0600\n" "> +++ work2/arch/ia64/hp/common/Makefile\t2007-09-19 10:51:15.000000000 -0600\n" "> @@ -8,3 +8,4 @@\n" "> obj-y := sba_iommu.o\n" @@ -61,8 +59,7 @@ "> obj-$(CONFIG_IA64_GENERIC) += hwsw_iommu.o\n" "> +obj-$(CONFIG_IA64_HP_AML_NFW) += aml_nfw.o\n" "> Index: work2/arch/ia64/hp/common/aml_nfw.c\n" - "> ===================================================================\n" - "> --- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "> =================================> --- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "> +++ work2/arch/ia64/hp/common/aml_nfw.c\t2007-09-20 14:05:21.000000000 -0600\n" "> @@ -0,0 +1,236 @@\n" "> +/*\n" @@ -196,7 +193,7 @@ "> +\n" "> +\tswitch (function) {\n" "> +\tcase ACPI_READ:\n" - "> +\t\tif (address == offsetof(struct ia64_nfw_context, ret))\n" + "> +\t\tif (address = offsetof(struct ia64_nfw_context, ret))\n" "> +\t\t\taml_nfw_execute(context);\n" "> +\t\taml_nfw_read_arg(offset, bit_width, value);\n" "> +\t\tbreak;\n" @@ -307,4 +304,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -fa0e747513b823b245aa2fce9d27a8c337b0136a8b5839f1f6659792d4e58030 +4a229b99d89b1b0c2d101aca76d6a9ea84d6136974193016225aae7fa6ca48c3
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.