diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-05-18 09:45:08 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-05-18 09:45:08 +0300 |
| commit | 85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34 (patch) | |
| tree | dc6b176404218efac28a4a1a0c240cb36f1e9173 /include/linux/memory.h | |
| parent | e9aa9c75c58e2e16be16ec2b5db5e14804d07213 (diff) | |
| parent | 040ab72ee10ea88e1883ad143b3e2b77596abc31 (diff) | |
| download | cachepc-linux-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.tar.gz cachepc-linux-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.zip | |
Merge branch 'fixes-rc1' into fixes
Diffstat (limited to 'include/linux/memory.h')
| -rw-r--r-- | include/linux/memory.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h index 4da95e684e20..97e92e8b556a 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -29,6 +29,11 @@ struct memory_block { int online_type; /* for passing data to online routine */ int nid; /* NID for this memory block */ struct device dev; + /* + * Number of vmemmap pages. These pages + * lay at the beginning of the memory block. + */ + unsigned long nr_vmemmap_pages; }; int arch_get_memory_phys_device(unsigned long start_pfn); @@ -80,7 +85,8 @@ static inline int memory_notify(unsigned long val, void *v) #else extern int register_memory_notifier(struct notifier_block *nb); extern void unregister_memory_notifier(struct notifier_block *nb); -int create_memory_block_devices(unsigned long start, unsigned long size); +int create_memory_block_devices(unsigned long start, unsigned long size, + unsigned long vmemmap_pages); void remove_memory_block_devices(unsigned long start, unsigned long size); extern void memory_dev_init(void); extern int memory_notify(unsigned long val, void *v); |