diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:04:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:04:28 +0100 |
| commit | 650400b2ccb8542ff4e2677d66ff083d01c7bd6a (patch) | |
| tree | 055ddec9479ec30cca661989b9902c13f52d533a /include/linux/mm.h | |
| parent | 0fd2e9c53d82704a3ba87ea1980ec515188c5316 (diff) | |
| parent | fec8f5ae1715a01c72ad52cb2ecd8aacaf142302 (diff) | |
Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base
Conflicts:
arch/x86/kernel/cpu/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 43edf659453b..91b46f99b4d2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2496,7 +2496,7 @@ void vmemmap_populate_print_last(void); void vmemmap_free(unsigned long start, unsigned long end); #endif void register_page_bootmem_memmap(unsigned long section_nr, struct page *map, - unsigned long size); + unsigned long nr_pages); enum mf_flags { MF_COUNT_INCREASED = 1 << 0, |