Page MenuHomeFreeBSD
Files F137393767

D5462.diff
No OneTemporary
Actions

D5462.diff
View Options

Index: sys/arm/arm/machdep.c
===================================================================
--- sys/arm/arm/machdep.c
+++ sys/arm/arm/machdep.c
@@ -1445,7 +1445,8 @@
struct pv_addr kernel_l1pt;
struct pv_addr dpcpu;
vm_offset_t dtbp, freemempos, l2_start, lastaddr;
- uint32_t memsize, l2size;
+ uint32_t l2size;
+ u_long memsize;
char *env;
void *kmdp;
u_int l1pagetable;
@@ -1714,7 +1715,7 @@
struct mem_region mem_regions[FDT_MEM_REGIONS];
vm_paddr_t lastaddr;
vm_offset_t dtbp, kernelstack, dpcpu;
- uint32_t memsize;
+ u_long memsize;
char *env;
void *kmdp;
int err_devmap, mem_regions_sz;
Index: sys/arm/mv/mv_common.c
===================================================================
--- sys/arm/mv/mv_common.c
+++ sys/arm/mv/mv_common.c
@@ -917,7 +917,8 @@
{
struct mem_region mr[FDT_MEM_REGIONS];
uint8_t window_valid[MV_WIN_DDR_MAX];
- int mr_cnt, memsize, err, i, j;
+ int mr_cnt, err, i, j;
+ u_long memsize;
uint32_t valid_win_num = 0;
/* Grab physical memory regions information from device tree. */
Index: sys/dev/cesa/cesa.c
===================================================================
--- sys/dev/cesa/cesa.c
+++ sys/dev/cesa/cesa.c
@@ -1641,7 +1641,8 @@
{
struct mem_region availmem_regions[FDT_MEM_REGIONS];
int availmem_regions_sz;
- uint32_t memsize, br, cr, i;
+ uint32_t br, cr, i;
+ u_long memsize;
/* Grab physical memory regions information from DTS */
if (fdt_get_mem_regions(availmem_regions, &availmem_regions_sz,
Index: sys/dev/fdt/fdt_common.h
===================================================================
--- sys/dev/fdt/fdt_common.h
+++ sys/dev/fdt/fdt_common.h
@@ -85,7 +85,7 @@
int fdt_data_to_res(pcell_t *, int, int, u_long *, u_long *);
phandle_t fdt_find_compatible(phandle_t, const char *, int);
phandle_t fdt_depth_search_compatible(phandle_t, const char *, int);
-int fdt_get_mem_regions(struct mem_region *, int *, uint32_t *);
+int fdt_get_mem_regions(struct mem_region *, int *, u_long *);
int fdt_get_reserved_regions(struct mem_region *, int *);
int fdt_get_phyaddr(phandle_t, device_t, int *, void **);
int fdt_get_range(phandle_t, int, u_long *, u_long *);
Index: sys/dev/fdt/fdt_common.c
===================================================================
--- sys/dev/fdt/fdt_common.c
+++ sys/dev/fdt/fdt_common.c
@@ -592,7 +592,6 @@
pcell_t reserve[FDT_REG_CELLS * FDT_MEM_REGIONS];
pcell_t *reservep;
phandle_t memory, root;
- uint32_t memory_size;
int addr_cells, size_cells;
int i, max_size, res_len, rv, tuple_size, tuples;
@@ -626,7 +625,6 @@
goto out;
}
- memory_size = 0;
tuples = res_len / tuple_size;
reservep = (pcell_t *)&reserve;
for (i = 0; i < tuples; i++) {
@@ -647,12 +645,12 @@
}
int
-fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, uint32_t *memsize)
+fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, u_long *memsize)
{
pcell_t reg[FDT_REG_CELLS * FDT_MEM_REGIONS];
pcell_t *regp;
phandle_t memory;
- uint32_t memory_size;
+ u_long memory_size;
int addr_cells, size_cells;
int i, max_size, reg_len, rv, tuple_size, tuples;
Index: sys/mips/beri/beri_machdep.c
===================================================================
--- sys/mips/beri/beri_machdep.c
+++ sys/mips/beri/beri_machdep.c
@@ -90,7 +90,8 @@
int i;
#ifdef FDT
struct mem_region mr[FDT_MEM_REGIONS];
- int mr_cnt, val;
+ u_long val;
+ int mr_cnt;
int j;
#endif
Index: sys/riscv/riscv/machdep.c
===================================================================
--- sys/riscv/riscv/machdep.c
+++ sys/riscv/riscv/machdep.c
@@ -739,7 +739,7 @@
vm_offset_t lastaddr;
int mem_regions_sz;
vm_size_t kernlen;
- uint32_t memsize;
+ u_long memsize;
caddr_t kmdp;
int i;

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 24, 1:20 AM (22 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26042289
Default Alt Text
D5462.diff (3 KB)

Event Timeline