aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/memory.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 02e633f3ede0..b3d9df060626 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -80,9 +80,9 @@ struct mem_section;
80#define IPC_CALLBACK_PRI 10 80#define IPC_CALLBACK_PRI 10
81 81
82#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE 82#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE
83static inline int memory_dev_init(void) 83static inline void memory_dev_init(void)
84{ 84{
85 return 0; 85 return;
86} 86}
87static inline int register_memory_notifier(struct notifier_block *nb) 87static inline int register_memory_notifier(struct notifier_block *nb)
88{ 88{
@@ -113,7 +113,7 @@ extern int register_memory_isolate_notifier(struct notifier_block *nb);
113extern void unregister_memory_isolate_notifier(struct notifier_block *nb); 113extern void unregister_memory_isolate_notifier(struct notifier_block *nb);
114int create_memory_block_devices(unsigned long start, unsigned long size); 114int create_memory_block_devices(unsigned long start, unsigned long size);
115void remove_memory_block_devices(unsigned long start, unsigned long size); 115void remove_memory_block_devices(unsigned long start, unsigned long size);
116extern int memory_dev_init(void); 116extern void memory_dev_init(void);
117extern int memory_notify(unsigned long val, void *v); 117extern int memory_notify(unsigned long val, void *v);
118extern int memory_isolate_notify(unsigned long val, void *v); 118extern int memory_isolate_notify(unsigned long val, void *v);
119extern struct memory_block *find_memory_block(struct mem_section *); 119extern struct memory_block *find_memory_block(struct mem_section *);