diff for duplicates of <1259207974.16367.226.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index 0e25a94..2f018f7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,10 +66,10 @@ Ben. > > - reg = (cell_t *)of_get_flat_dt_prop(node, "linux,usable-memory", &l); > + reg = (u32 *)of_get_flat_dt_prop(node, "linux,usable-memory", &l); -> if (reg == NULL) +> if (reg = NULL) > - reg = (cell_t *)of_get_flat_dt_prop(node, "reg", &l); > + reg = (u32 *)of_get_flat_dt_prop(node, "reg", &l); -> if (reg == NULL) +> if (reg = NULL) > return 0; > > - endp = reg + (l / sizeof(cell_t)); @@ -101,14 +101,14 @@ Ben. > unsigned int is_kexec_kdump = 0, rngs; > > ls = of_get_flat_dt_prop(node, "ibm,lmb-size", &l); -> - if (ls == NULL || l < dt_root_size_cells * sizeof(cell_t)) -> + if (ls == NULL || l < dt_root_size_cells * sizeof(u32)) +> - if (ls = NULL || l < dt_root_size_cells * sizeof(cell_t)) +> + if (ls = NULL || l < dt_root_size_cells * sizeof(u32)) > return 0; > lmb_size = dt_mem_next_cell(dt_root_size_cells, &ls); > > dm = of_get_flat_dt_prop(node, "ibm,dynamic-memory", &l); -> - if (dm == NULL || l < sizeof(cell_t)) -> + if (dm == NULL || l < sizeof(u32)) +> - if (dm = NULL || l < sizeof(cell_t)) +> + if (dm = NULL || l < sizeof(u32)) > return 0; > > n = *dm++; /* number of entries */ @@ -127,7 +127,7 @@ Ben. > > /* Look for the ibm,dynamic-reconfiguration-memory node */ > @@ -540,7 +538,7 @@ static int __init early_init_dt_scan_memory(unsigned long node, -> if (reg == NULL) +> if (reg = NULL) > return 0; > > - endp = reg + (l / sizeof(cell_t)); diff --git a/a/content_digest b/N1/content_digest index a567a52..c9f175f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,14 @@ "ref\020091124081827.6216.1896.stgit@angua\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 04/11] of/flattree: eliminate cell_t typedef\0" - "Date\0Thu, 26 Nov 2009 14:59:34 +1100\0" - "To\0Grant Likely <grant.likely@secretlab.ca>\0" - "Cc\0sfr@canb.auug.org.au" - monstr@monstr.eu - microblaze-uclinux@itee.uq.edu.au - devicetree-discuss@lists.ozlabs.org - sparclinux@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - " davem@davemloft.net\0" + "Date\0Thu, 26 Nov 2009 03:59:34 +0000\0" + "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" + "Cc\0sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org" + microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + " davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" "\00:1\0" "b\0" "On Tue, 2009-11-24 at 01:18 -0700, Grant Likely wrote:\n" @@ -81,10 +80,10 @@ "> \n" "> -\treg = (cell_t *)of_get_flat_dt_prop(node, \"linux,usable-memory\", &l);\n" "> +\treg = (u32 *)of_get_flat_dt_prop(node, \"linux,usable-memory\", &l);\n" - "> \tif (reg == NULL)\n" + "> \tif (reg = NULL)\n" "> -\t\treg = (cell_t *)of_get_flat_dt_prop(node, \"reg\", &l);\n" "> +\t\treg = (u32 *)of_get_flat_dt_prop(node, \"reg\", &l);\n" - "> \tif (reg == NULL)\n" + "> \tif (reg = NULL)\n" "> \t\treturn 0;\n" "> \n" "> -\tendp = reg + (l / sizeof(cell_t));\n" @@ -116,14 +115,14 @@ "> \tunsigned int is_kexec_kdump = 0, rngs;\n" "> \n" "> \tls = of_get_flat_dt_prop(node, \"ibm,lmb-size\", &l);\n" - "> -\tif (ls == NULL || l < dt_root_size_cells * sizeof(cell_t))\n" - "> +\tif (ls == NULL || l < dt_root_size_cells * sizeof(u32))\n" + "> -\tif (ls = NULL || l < dt_root_size_cells * sizeof(cell_t))\n" + "> +\tif (ls = NULL || l < dt_root_size_cells * sizeof(u32))\n" "> \t\treturn 0;\n" "> \tlmb_size = dt_mem_next_cell(dt_root_size_cells, &ls);\n" "> \n" "> \tdm = of_get_flat_dt_prop(node, \"ibm,dynamic-memory\", &l);\n" - "> -\tif (dm == NULL || l < sizeof(cell_t))\n" - "> +\tif (dm == NULL || l < sizeof(u32))\n" + "> -\tif (dm = NULL || l < sizeof(cell_t))\n" + "> +\tif (dm = NULL || l < sizeof(u32))\n" "> \t\treturn 0;\n" "> \n" "> \tn = *dm++;\t/* number of entries */\n" @@ -142,7 +141,7 @@ "> \n" "> \t/* Look for the ibm,dynamic-reconfiguration-memory node */\n" "> @@ -540,7 +538,7 @@ static int __init early_init_dt_scan_memory(unsigned long node,\n" - "> \tif (reg == NULL)\n" + "> \tif (reg = NULL)\n" "> \t\treturn 0;\n" "> \n" "> -\tendp = reg + (l / sizeof(cell_t));\n" @@ -151,4 +150,4 @@ "> \tDBG(\"memory scan node %s, reg size %ld, data: %x %x %x %x,\\n\",\n" "> \t uname, l, reg[0], reg[1], reg[2], reg[3]);" -369649add2f7aea6921937801a5bb0d036aa3f2159f7fd0000a36ab86e10a19f +383dd68e8565f6e2401983923bba10799da9cc619448765318d9cb976d077e95
diff --git a/a/1.txt b/N2/1.txt index 0e25a94..cdfb04e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ On Tue, 2009-11-24 at 01:18 -0700, Grant Likely wrote: > to redefine it to cell_t. Eliminate the unnecessary typedef so that > it doesn't have to be added to the of_fdt header file > -> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> +> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> > --- I'm not sure about that one. Yes, we do use u32 a lot and cell_t rarely, diff --git a/a/content_digest b/N2/content_digest index a567a52..cd6a356 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,15 @@ "ref\020091124081316.6216.66310.stgit@angua\0" "ref\020091124081827.6216.1896.stgit@angua\0" - "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" + "From\0Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>\0" "Subject\0Re: [PATCH 04/11] of/flattree: eliminate cell_t typedef\0" "Date\0Thu, 26 Nov 2009 14:59:34 +1100\0" - "To\0Grant Likely <grant.likely@secretlab.ca>\0" - "Cc\0sfr@canb.auug.org.au" - monstr@monstr.eu - microblaze-uclinux@itee.uq.edu.au - devicetree-discuss@lists.ozlabs.org - sparclinux@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - " davem@davemloft.net\0" + "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" + "Cc\0sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org" + microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + " davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" "\00:1\0" "b\0" "On Tue, 2009-11-24 at 01:18 -0700, Grant Likely wrote:\n" @@ -18,7 +17,7 @@ "> to redefine it to cell_t. Eliminate the unnecessary typedef so that\n" "> it doesn't have to be added to the of_fdt header file\n" "> \n" - "> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>\n" + "> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\n" "> ---\n" "\n" "I'm not sure about that one. Yes, we do use u32 a lot and cell_t rarely,\n" @@ -151,4 +150,4 @@ "> \tDBG(\"memory scan node %s, reg size %ld, data: %x %x %x %x,\\n\",\n" "> \t uname, l, reg[0], reg[1], reg[2], reg[3]);" -369649add2f7aea6921937801a5bb0d036aa3f2159f7fd0000a36ab86e10a19f +7bdeb2fe2155101c7cafe6405ad42c8897b358d8ffe10befb366927e49f8b936
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.