| Message ID | 20201030011805.1224603-2-nathanl@linux.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | partition suspend updates | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (8cb17737940b156329cb5210669b9c9b23f4dd56) |
| snowpatch_ozlabs/checkpatch | success | |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Nathan Lynch <nathanl@linux.ibm.com> writes: > rtas_call_reentrant() isn't platform-dependent; move it out of > CONFIG_PPC_PSERIES-guarded code. As reported by the 0-day CI, this is mistaken, and it breaks non-pseries builds: >> arch/powerpc/kernel/rtas.c:938:21: error: no member named 'rtas_args_reentrant' in 'struct paca_struct' args = local_paca->rtas_args_reentrant; ~~~~~~~~~~ ^ 1 error generated. https://lore.kernel.org/linuxppc-dev/202012050432.SFbbjWMw-lkp@intel.com/ I'll drop this and reroll the series.
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 954f41676f69..b40fc892138b 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -897,6 +897,12 @@ int rtas_ibm_suspend_me(u64 handle) return atomic_read(&data.error); } +#else /* CONFIG_PPC_PSERIES */ +int rtas_ibm_suspend_me(u64 handle) +{ + return -ENOSYS; +} +#endif /** * rtas_call_reentrant() - Used for reentrant rtas calls @@ -948,13 +954,6 @@ int rtas_call_reentrant(int token, int nargs, int nret, int *outputs, ...) return ret; } -#else /* CONFIG_PPC_PSERIES */ -int rtas_ibm_suspend_me(u64 handle) -{ - return -ENOSYS; -} -#endif - /** * Find a specific pseries error log in an RTAS extended event log. * @log: RTAS error/event log
rtas_call_reentrant() isn't platform-dependent; move it out of CONFIG_PPC_PSERIES-guarded code. Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> --- arch/powerpc/kernel/rtas.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)