| Message ID | 20221118150751.469393-8-nathanl@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9581f8a00777a073fdd8146659a51ca007cae8d6 |
| Headers | show |
| Series | RTAS maintenance | expand |
On Fri, 2022-11-18 at 09:07 -0600, Nathan Lynch wrote: > rtas.c used to host complex code related to pseries-specific guest > migration and suspend, which used atomics, completions, hcalls, and > CPU hotplug APIs. That's all been deleted or moved, so remove the > include directives that have been rendered unnecessary. Sort the > remainder (with linux/ before asm/) to impose some order on where > future additions go. > > Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> Compiles for me. Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> > --- > arch/powerpc/kernel/rtas.c | 42 +++++++++++++++--------------------- > -- > 1 file changed, 16 insertions(+), 26 deletions(-) > > diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c > index 3fa84c247415..7a5812624e11 100644 > --- a/arch/powerpc/kernel/rtas.c > +++ b/arch/powerpc/kernel/rtas.c > @@ -7,43 +7,33 @@ > * Copyright (C) 2001 IBM. > */ > > -#include <linux/stdarg.h> > -#include <linux/kernel.h> > -#include <linux/types.h> > -#include <linux/spinlock.h> > -#include <linux/export.h> > -#include <linux/init.h> > #include <linux/capability.h> > #include <linux/delay.h> > -#include <linux/cpu.h> > -#include <linux/sched.h> > -#include <linux/smp.h> > -#include <linux/completion.h> > -#include <linux/cpumask.h> > +#include <linux/export.h> > +#include <linux/init.h> > +#include <linux/kernel.h> > #include <linux/memblock.h> > -#include <linux/slab.h> > +#include <linux/of.h> > +#include <linux/of_fdt.h> > #include <linux/reboot.h> > +#include <linux/sched.h> > #include <linux/security.h> > +#include <linux/slab.h> > +#include <linux/spinlock.h> > +#include <linux/stdarg.h> > #include <linux/syscalls.h> > -#include <linux/of.h> > -#include <linux/of_fdt.h> > +#include <linux/types.h> > +#include <linux/uaccess.h> > > +#include <asm/delay.h> > +#include <asm/firmware.h> > #include <asm/interrupt.h> > -#include <asm/rtas.h> > -#include <asm/hvcall.h> > #include <asm/machdep.h> > -#include <asm/firmware.h> > +#include <asm/mmu.h> > #include <asm/page.h> > -#include <asm/param.h> > -#include <asm/delay.h> > -#include <linux/uaccess.h> > -#include <asm/udbg.h> > -#include <asm/syscalls.h> > -#include <asm/smp.h> > -#include <linux/atomic.h> > +#include <asm/rtas.h> > #include <asm/time.h> > -#include <asm/mmu.h> > -#include <asm/topology.h> > +#include <asm/udbg.h> > > /* This is here deliberately so it's only used in this file */ > void enter_rtas(unsigned long);
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 3fa84c247415..7a5812624e11 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -7,43 +7,33 @@ * Copyright (C) 2001 IBM. */ -#include <linux/stdarg.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/spinlock.h> -#include <linux/export.h> -#include <linux/init.h> #include <linux/capability.h> #include <linux/delay.h> -#include <linux/cpu.h> -#include <linux/sched.h> -#include <linux/smp.h> -#include <linux/completion.h> -#include <linux/cpumask.h> +#include <linux/export.h> +#include <linux/init.h> +#include <linux/kernel.h> #include <linux/memblock.h> -#include <linux/slab.h> +#include <linux/of.h> +#include <linux/of_fdt.h> #include <linux/reboot.h> +#include <linux/sched.h> #include <linux/security.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/stdarg.h> #include <linux/syscalls.h> -#include <linux/of.h> -#include <linux/of_fdt.h> +#include <linux/types.h> +#include <linux/uaccess.h> +#include <asm/delay.h> +#include <asm/firmware.h> #include <asm/interrupt.h> -#include <asm/rtas.h> -#include <asm/hvcall.h> #include <asm/machdep.h> -#include <asm/firmware.h> +#include <asm/mmu.h> #include <asm/page.h> -#include <asm/param.h> -#include <asm/delay.h> -#include <linux/uaccess.h> -#include <asm/udbg.h> -#include <asm/syscalls.h> -#include <asm/smp.h> -#include <linux/atomic.h> +#include <asm/rtas.h> #include <asm/time.h> -#include <asm/mmu.h> -#include <asm/topology.h> +#include <asm/udbg.h> /* This is here deliberately so it's only used in this file */ void enter_rtas(unsigned long);
rtas.c used to host complex code related to pseries-specific guest migration and suspend, which used atomics, completions, hcalls, and CPU hotplug APIs. That's all been deleted or moved, so remove the include directives that have been rendered unnecessary. Sort the remainder (with linux/ before asm/) to impose some order on where future additions go. Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> --- arch/powerpc/kernel/rtas.c | 42 +++++++++++++++----------------------- 1 file changed, 16 insertions(+), 26 deletions(-)