git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
linux
/
memory.h
diff --git
a/include/linux/memory.h
b/include/linux/memory.h
index
8f04143
..
654ef55
100644
(file)
--- a/
include/linux/memory.h
+++ b/
include/linux/memory.h
@@
-57,7
+57,7
@@
struct memory_block {
struct notifier_block;
struct mem_section;
struct notifier_block;
struct mem_section;
-#ifndef CONFIG_MEMORY_HOTPLUG
+#ifndef CONFIG_MEMORY_HOTPLUG
_SPARSE
static inline int memory_dev_init(void)
{
return 0;
static inline int memory_dev_init(void)
{
return 0;
@@
-78,7
+78,7
@@
extern int remove_memory_block(unsigned long, struct mem_section *, int);
#define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT)
#define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT)
-#endif /* CONFIG_MEMORY_HOTPLUG */
+#endif /* CONFIG_MEMORY_HOTPLUG
_SPARSE
*/
#define hotplug_memory_notifier(fn, pri) { \
static struct notifier_block fn##_mem_nb = \
#define hotplug_memory_notifier(fn, pri) { \
static struct notifier_block fn##_mem_nb = \