projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0582e57
)
x86, mm: Undo incorrect revert in arch/x86/mm/init.c
author
Yinghai Lu
<yinghai@kernel.org>
Thu, 25 Oct 2012 22:45:26 +0000
(15:45 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 31 Oct 2012 16:51:37 +0000
(09:51 -0700)
commit
f82f64dd9f485e13f29f369772d4a0e868e5633a
upstream.
Commit
844ab6f9
x86, mm: Find_early_table_space based on ranges that are actually being mapped
added back some lines back wrongly that has been removed in commit
7b16bbf97
Revert "x86/mm: Fix the size calculation of mapping tables"
remove them again.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link:
http://lkml.kernel.org/r/CAE9FiQW_vuaYQbmagVnxT2DGsYc=9tNeAbdBq53sYkitPOwxSQ@mail.gmail.com
Acked-by: Jacob Shin <jacob.shin@amd.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/mm/init.c
patch
|
blob
|
history
diff --git
a/arch/x86/mm/init.c
b/arch/x86/mm/init.c
index
1dccf01
..
c22c423
100644
(file)
--- a/
arch/x86/mm/init.c
+++ b/
arch/x86/mm/init.c
@@
-64,10
+64,6
@@
static void __init find_early_table_space(struct map_range *mr, int nr_range)
#ifdef CONFIG_X86_32
extra += PMD_SIZE;
#endif
- /* The first 2/4M doesn't use large pages. */
- if (mr[i].start < PMD_SIZE)
- extra += range;
-
ptes += (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;
} else {
ptes += (range + PAGE_SIZE - 1) >> PAGE_SHIFT;