projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
hotplug-memory.c
diff --git
a/arch/powerpc/platforms/pseries/hotplug-memory.c
b/arch/powerpc/platforms/pseries/hotplug-memory.c
index
ac01e18
..
c904583
100644
(file)
--- a/
arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/
arch/powerpc/platforms/pseries/hotplug-memory.c
@@
-146,7
+146,7
@@
static inline int pseries_remove_memblock(unsigned long base,
}
static inline int pseries_remove_mem_node(struct device_node *np)
{
- return
-EOPNOTSUPP
;
+ return
0
;
}
#endif /* CONFIG_MEMORY_HOTREMOVE */