Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4d629f9a02e32f8fe035a11018472ea8ff9647eb

Authored by Benjamin Herrenschmidt
1 parent 3a9c2c81eb
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

memblock: Define MEMBLOCK_ERROR internally instead of using ~(phys_addr_t)0 

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 1 changed file with 7 additions and 5 deletions Side-by-side Diff

... ... @@ -22,6 +22,8 @@
22 22 static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1];
23 23 static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1];
24 24  
  25 +#define MEMBLOCK_ERROR (~(phys_addr_t)0)
  26 +
25 27 static int __init early_memblock(char *p)
26 28 {
27 29 if (p && strstr(p, "debug"))
... ... @@ -326,7 +328,7 @@
326 328 base = memblock_align_down(res_base - size, align);
327 329 }
328 330  
329   - return ~(phys_addr_t)0;
  331 + return MEMBLOCK_ERROR;
330 332 }
331 333  
332 334 phys_addr_t __weak __init memblock_nid_range(phys_addr_t start, phys_addr_t end, int *nid)
333 335  
... ... @@ -353,14 +355,14 @@
353 355 this_end = memblock_nid_range(start, end, &this_nid);
354 356 if (this_nid == nid) {
355 357 phys_addr_t ret = memblock_find_region(start, this_end, size, align);
356   - if (ret != ~(phys_addr_t)0 &&
  358 + if (ret != MEMBLOCK_ERROR &&
357 359 memblock_add_region(&memblock.reserved, ret, size) >= 0)
358 360 return ret;
359 361 }
360 362 start = this_end;
361 363 }
362 364  
363   - return ~(phys_addr_t)0;
  365 + return MEMBLOCK_ERROR;
364 366 }
365 367  
366 368 phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int nid)
... ... @@ -379,7 +381,7 @@
379 381 for (i = 0; i < mem->cnt; i++) {
380 382 phys_addr_t ret = memblock_alloc_nid_region(&mem->regions[i],
381 383 size, align, nid);
382   - if (ret != ~(phys_addr_t)0)
  384 + if (ret != MEMBLOCK_ERROR)
383 385 return ret;
384 386 }
385 387  
... ... @@ -430,7 +432,7 @@
430 432 continue;
431 433 base = min(memblockbase + memblocksize, max_addr);
432 434 res_base = memblock_find_region(memblockbase, base, size, align);
433   - if (res_base != ~(phys_addr_t)0 &&
  435 + if (res_base != MEMBLOCK_ERROR &&
434 436 memblock_add_region(&memblock.reserved, res_base, size) >= 0)
435 437 return res_base;
436 438 }