diff options
Diffstat (limited to 'include/linux/memory.h')
| -rw-r--r-- | include/linux/memory.h | 6 |
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 |
| 83 | static inline int memory_dev_init(void) | 83 | static inline void memory_dev_init(void) |
| 84 | { | 84 | { |
| 85 | return 0; | 85 | return; |
| 86 | } | 86 | } |
| 87 | static inline int register_memory_notifier(struct notifier_block *nb) | 87 | static 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); | |||
| 113 | extern void unregister_memory_isolate_notifier(struct notifier_block *nb); | 113 | extern void unregister_memory_isolate_notifier(struct notifier_block *nb); |
| 114 | int create_memory_block_devices(unsigned long start, unsigned long size); | 114 | int create_memory_block_devices(unsigned long start, unsigned long size); |
| 115 | void remove_memory_block_devices(unsigned long start, unsigned long size); | 115 | void remove_memory_block_devices(unsigned long start, unsigned long size); |
| 116 | extern int memory_dev_init(void); | 116 | extern void memory_dev_init(void); |
| 117 | extern int memory_notify(unsigned long val, void *v); | 117 | extern int memory_notify(unsigned long val, void *v); |
| 118 | extern int memory_isolate_notify(unsigned long val, void *v); | 118 | extern int memory_isolate_notify(unsigned long val, void *v); |
| 119 | extern struct memory_block *find_memory_block(struct mem_section *); | 119 | extern struct memory_block *find_memory_block(struct mem_section *); |
