git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'memblock-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...
[sfrench/cifs-2.6.git]
/
mm
/
memblock.c
diff --git
a/mm/memblock.c
b/mm/memblock.c
index 8c194d8afeecbd841b326eccdedd01cac6bf4f88..abd92869874d75f62cd303475ba2b44c67db38ac 100644
(file)
--- a/
mm/memblock.c
+++ b/
mm/memblock.c
@@
-1885,7
+1885,7
@@
int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
int mid = memblock_search(type, PFN_PHYS(pfn));
if (mid == -1)
- return
-1
;
+ return
NUMA_NO_NODE
;
*start_pfn = PFN_DOWN(type->regions[mid].base);
*end_pfn = PFN_DOWN(type->regions[mid].base + type->regions[mid].size);