git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
linux
/
memory_hotplug.h
diff --git
a/include/linux/memory_hotplug.h
b/include/linux/memory_hotplug.h
index
9112063
..
968b1aa
100644
(file)
--- a/
include/linux/memory_hotplug.h
+++ b/
include/linux/memory_hotplug.h
@@
-58,6
+58,8
@@
extern int add_one_highpage(struct page *page, int pfn, int bad_ppro);
/* need some defines for these for archs that don't support it */
extern void online_page(struct page *page);
/* VM interface that may be used by firmware interface */
/* need some defines for these for archs that don't support it */
extern void online_page(struct page *page);
/* VM interface that may be used by firmware interface */
+extern int add_memory(u64 start, u64 size);
+extern int remove_memory(u64 start, u64 size);
extern int online_pages(unsigned long, unsigned long);
/* reasonably generic interface to expand the physical pages in a zone */
extern int online_pages(unsigned long, unsigned long);
/* reasonably generic interface to expand the physical pages in a zone */
@@
-90,6
+92,11
@@
static inline int mhp_notimplemented(const char *func)
return -ENOSYS;
}
return -ENOSYS;
}
+static inline int __add_pages(struct zone *zone, unsigned long start_pfn,
+ unsigned long nr_pages)
+{
+ return mhp_notimplemented(__FUNCTION__);
+}
#endif /* ! CONFIG_MEMORY_HOTPLUG */
static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
unsigned long nr_pages)
#endif /* ! CONFIG_MEMORY_HOTPLUG */
static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
unsigned long nr_pages)
@@
-98,8
+105,4
@@
static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
dump_stack();
return -ENOSYS;
}
dump_stack();
return -ENOSYS;
}
-
-extern int add_memory(u64 start, u64 size);
-extern int remove_memory(u64 start, u64 size);
-
#endif /* __LINUX_MEMORY_HOTPLUG_H */
#endif /* __LINUX_MEMORY_HOTPLUG_H */