projects
/
firefly-linux-kernel-4.4.55.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
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
kernel
/
rtas.c
diff --git
a/arch/powerpc/kernel/rtas.c
b/arch/powerpc/kernel/rtas.c
index 41048de3c6c396d84826e68a12edc639f86b0587..8fe8bc61c10a5543a2cd1553fbe613a096054586 100644
(file)
--- a/
arch/powerpc/kernel/rtas.c
+++ b/
arch/powerpc/kernel/rtas.c
@@
-805,7
+805,7
@@
static void rtas_percpu_suspend_me(void *info)
__rtas_suspend_cpu((struct rtas_suspend_me_data *)info, 1);
}
__rtas_suspend_cpu((struct rtas_suspend_me_data *)info, 1);
}
-
static
int rtas_ibm_suspend_me(struct rtas_args *args)
+int rtas_ibm_suspend_me(struct rtas_args *args)
{
long state;
long rc;
{
long state;
long rc;
@@
-855,7
+855,7
@@
static int rtas_ibm_suspend_me(struct rtas_args *args)
return atomic_read(&data.error);
}
#else /* CONFIG_PPC_PSERIES */
return atomic_read(&data.error);
}
#else /* CONFIG_PPC_PSERIES */
-
static
int rtas_ibm_suspend_me(struct rtas_args *args)
+int rtas_ibm_suspend_me(struct rtas_args *args)
{
return -ENOSYS;
}
{
return -ENOSYS;
}
@@
-969,7
+969,7
@@
void __init rtas_initialize(void)
*/
#ifdef CONFIG_PPC64
if (machine_is(pseries) && firmware_has_feature(FW_FEATURE_LPAR)) {
*/
#ifdef CONFIG_PPC64
if (machine_is(pseries) && firmware_has_feature(FW_FEATURE_LPAR)) {
- rtas_region = min(
memblock.rmo
_size, RTAS_INSTANTIATE_MAX);
+ rtas_region = min(
ppc64_rma
_size, RTAS_INSTANTIATE_MAX);
ibm_suspend_me_token = rtas_token("ibm,suspend-me");
}
#endif
ibm_suspend_me_token = rtas_token("ibm,suspend-me");
}
#endif