A cell is firmly established as a u32. No need to do an ugly typedef
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>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
#include <asm/sections.h>
#include <asm/pci-bridge.h>
#include <asm/sections.h>
#include <asm/pci-bridge.h>
/* export that to outside world */
struct device_node *of_chosen;
/* export that to outside world */
struct device_node *of_chosen;
const char *uname, int depth, void *data)
{
char *type = of_get_flat_dt_prop(node, "device_type", NULL);
const char *uname, int depth, void *data)
{
char *type = of_get_flat_dt_prop(node, "device_type", NULL);
unsigned long l;
/* Look for the ibm,dynamic-reconfiguration-memory node */
unsigned long l;
/* Look for the ibm,dynamic-reconfiguration-memory node */
} else if (strcmp(type, "memory") != 0)
return 0;
} else if (strcmp(type, "memory") != 0)
return 0;
- reg = (cell_t *)of_get_flat_dt_prop(node, "linux,usable-memory", &l);
+ reg = (__be32 *)of_get_flat_dt_prop(node, "linux,usable-memory", &l);
- reg = (cell_t *)of_get_flat_dt_prop(node, "reg", &l);
+ reg = (__be32 *)of_get_flat_dt_prop(node, "reg", &l);
if (reg == NULL)
return 0;
if (reg == NULL)
return 0;
- endp = reg + (l / sizeof(cell_t));
+ endp = reg + (l / sizeof(__be32));
pr_debug("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",
uname, l, reg[0], reg[1], reg[2], reg[3]);
pr_debug("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",
uname, l, reg[0], reg[1], reg[2], reg[3]);
unsigned long tce_alloc_start, tce_alloc_end;
#endif
unsigned long tce_alloc_start, tce_alloc_end;
#endif
extern rwlock_t devtree_lock; /* temporary while merging */
/* export that to outside world */
extern rwlock_t devtree_lock; /* temporary while merging */
/* export that to outside world */
*/
static int __init early_init_dt_scan_drconf_memory(unsigned long node)
{
*/
static int __init early_init_dt_scan_drconf_memory(unsigned long node)
{
unsigned long l, n, flags;
u64 base, size, lmb_size;
unsigned int is_kexec_kdump = 0, rngs;
ls = of_get_flat_dt_prop(node, "ibm,lmb-size", &l);
unsigned long l, n, flags;
u64 base, size, lmb_size;
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(__be32))
return 0;
lmb_size = dt_mem_next_cell(dt_root_size_cells, &ls);
dm = of_get_flat_dt_prop(node, "ibm,dynamic-memory", &l);
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(__be32))
return 0;
n = *dm++; /* number of entries */
return 0;
n = *dm++; /* number of entries */
- if (l < (n * (dt_root_addr_cells + 4) + 1) * sizeof(cell_t))
+ if (l < (n * (dt_root_addr_cells + 4) + 1) * sizeof(__be32))
return 0;
/* check if this is a kexec/kdump kernel. */
return 0;
/* check if this is a kexec/kdump kernel. */
const char *uname, int depth, void *data)
{
char *type = of_get_flat_dt_prop(node, "device_type", NULL);
const char *uname, int depth, void *data)
{
char *type = of_get_flat_dt_prop(node, "device_type", NULL);
unsigned long l;
/* Look for the ibm,dynamic-reconfiguration-memory node */
unsigned long l;
/* Look for the ibm,dynamic-reconfiguration-memory node */
if (reg == NULL)
return 0;
if (reg == NULL)
return 0;
- endp = reg + (l / sizeof(cell_t));
+ endp = reg + (l / sizeof(__be32));
DBG("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",
uname, l, reg[0], reg[1], reg[2], reg[3]);
DBG("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",
uname, l, reg[0], reg[1], reg[2], reg[3]);