projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.55' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.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 9a432de363b8d081d0663f8795f28ff7354ce378..bebe64ed5dc32ee84e2d4f7d280a02f3df54ce54 100644
(file)
--- a/
arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/
arch/powerpc/platforms/pseries/hotplug-memory.c
@@
-158,7
+158,7
@@
static int pseries_remove_memory(struct device_node *np)
static inline int pseries_remove_memblock(unsigned long base,
unsigned int memblock_size)
{
- return
-EOPNOTSUPP
;
+ return
0
;
}
static inline int pseries_remove_memory(struct device_node *np)
{