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
CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
mm
/
discontig.c
diff --git
a/arch/ia64/mm/discontig.c
b/arch/ia64/mm/discontig.c
index d8c5fcd89e5bf4aa2fc07611708ff0c1c8a55b74..d85ba98d90087dea812636768a2f223e6a940fdf 100644
(file)
--- a/
arch/ia64/mm/discontig.c
+++ b/
arch/ia64/mm/discontig.c
@@
-635,7
+635,6
@@
static __init int count_node_pages(unsigned long start, unsigned long len, int n
(min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT;
#endif
start = GRANULEROUNDDOWN(start);
- start = ORDERROUNDDOWN(start);
end = GRANULEROUNDUP(end);
mem_data[node].max_pfn = max(mem_data[node].max_pfn,
end >> PAGE_SHIFT);