diff for duplicates of <20091124081827.6216.1896.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index fb72d23..02a5ebc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,10 +37,10 @@ index e0f4c34..7760186 100644 - 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)); @@ -72,14 +72,14 @@ index 048e3a3..43cdba2 100644 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 */ @@ -98,7 +98,7 @@ index 048e3a3..43cdba2 100644 /* 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 6afde1c..17eb036 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,14 @@ "ref\020091124081316.6216.66310.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[PATCH 04/11] of/flattree: eliminate cell_t typedef\0" - "Date\0Tue, 24 Nov 2009 01:18:35 -0700\0" + "Date\0Tue, 24 Nov 2009 08:18:35 +0000\0" "To\0linuxppc-dev@lists.ozlabs.org" devicetree-discuss@lists.ozlabs.org sparclinux@vger.kernel.org microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "A cell is firmly established as a u32. No need to do an ugly typedef\n" @@ -51,10 +50,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" @@ -86,14 +85,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" @@ -112,7 +111,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" @@ -121,4 +120,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]);" -78df26fc43d73bca0f2a833a42bb04530ef71b9fb07c71efa0519ebf6a4a1145 +5011c966fe6a6c5c79f195ced1c549c234c860b50a545c85bed6eccd5cdd0511
diff --git a/a/content_digest b/N2/content_digest index 6afde1c..e1652b2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,8 +8,7 @@ microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "A cell is firmly established as a u32. No need to do an ugly typedef\n" @@ -121,4 +120,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]);" -78df26fc43d73bca0f2a833a42bb04530ef71b9fb07c71efa0519ebf6a4a1145 +58298f65219e3d96545ee21378acdc6955ece530f0742fcc3115b9065d92ae0d
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.