mips: Accidental removal of paravirt_cpus_done?

mips: Accidental removal of paravirt_cpus_done?

[Geert Uytterhoeven]

Hi Ralf,

It seems you accidentally assimilated an (unwanted?) kvm change in my
patch:

On Tue, Jun 10, 2014 at 3:31 AM, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org> wrote:
> Gitweb:     http://git.kernel.org/linus/;a=commit;h=5e888e8fb55cf3da870b85d04fef6bfe0d57c974
> Commit:     5e888e8fb55cf3da870b85d04fef6bfe0d57c974
> Parent:     a1eace4ba53546bc7a6670b1c380cd5c1287ae8b
> Refname:    refs/heads/master
> Author:     Geert Uytterhoeven <geert@linux-m68k.org>
> AuthorDate: Tue Apr 22 12:51:13 2014 +0200
> Committer:  Ralf Baechle <ralf@linux-mips.org>
> CommitDate: Mon Jun 2 16:34:41 2014 +0200
>
>     mips: Update the email address of Geert Uytterhoeven
>
>     All my Sony addresses are defunct.
>
>     Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>     Cc: linux-mips@linux-mips.org
>     Patchwork: https://patchwork.linux-mips.org/patch/6817/
>     Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> ---
>  arch/mips/include/asm/nile4.h     |    2 +-
>  arch/mips/paravirt/paravirt-smp.c |    5 -----
>  arch/mips/pci/ops-pmcmsp.c        |    2 +-
>  arch/mips/pci/ops-tx3927.c        |    2 +-
>  4 files changed, 3 insertions(+), 8 deletions(-)

> diff --git a/arch/mips/paravirt/paravirt-smp.c b/arch/mips/paravirt/paravirt-smp.c
> index 73a123e..0164b0c 100644
> --- a/arch/mips/paravirt/paravirt-smp.c
> +++ b/arch/mips/paravirt/paravirt-smp.c
> @@ -99,10 +99,6 @@ static void paravirt_smp_finish(void)
>         local_irq_enable();
>  }
>
> -static void paravirt_cpus_done(void)
> -{
> -}
> -
>  static void paravirt_boot_secondary(int cpu, struct task_struct *idle)
>  {
>         paravirt_smp_gp[cpu] = (unsigned long)task_thread_info(idle);
> @@ -141,7 +137,6 @@ struct plat_smp_ops paravirt_smp_ops = {
>         .send_ipi_mask          = paravirt_send_ipi_mask,
>         .init_secondary         = paravirt_init_secondary,
>         .smp_finish             = paravirt_smp_finish,
> -       .cpus_done              = paravirt_cpus_done,
>         .boot_secondary         = paravirt_boot_secondary,
>         .smp_setup              = paravirt_smp_setup,
>         .prepare_cpus           = paravirt_prepare_cpus,

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: mips: Accidental removal of paravirt_cpus_done?

[Andreas Herrmann]

On Fri, Jun 13, 2014 at 12:02:30PM +0200, Geert Uytterhoeven wrote:
> Hi Ralf,
> 
> It seems you accidentally assimilated an (unwanted?) kvm change in my
> patch:

Hi Geert,

Actually this change was wanted. After Ralf informed me about a
compile error in linux-next I've sent him an update for one of my
mips-paravirt patches.

Unfortunately that ended up in your (unrelated patch).


Andreas

> On Tue, Jun 10, 2014 at 3:31 AM, Linux Kernel Mailing List
> <linux-kernel@vger.kernel.org> wrote:
> > Gitweb:     http://git.kernel.org/linus/;a=commit;h=5e888e8fb55cf3da870b85d04fef6bfe0d57c974
> > Commit:     5e888e8fb55cf3da870b85d04fef6bfe0d57c974
> > Parent:     a1eace4ba53546bc7a6670b1c380cd5c1287ae8b
> > Refname:    refs/heads/master
> > Author:     Geert Uytterhoeven <geert@linux-m68k.org>
> > AuthorDate: Tue Apr 22 12:51:13 2014 +0200
> > Committer:  Ralf Baechle <ralf@linux-mips.org>
> > CommitDate: Mon Jun 2 16:34:41 2014 +0200
> >
> >     mips: Update the email address of Geert Uytterhoeven
> >
> >     All my Sony addresses are defunct.
> >
> >     Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> >     Cc: linux-mips@linux-mips.org
> >     Patchwork: https://patchwork.linux-mips.org/patch/6817/
> >     Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> > ---
> >  arch/mips/include/asm/nile4.h     |    2 +-
> >  arch/mips/paravirt/paravirt-smp.c |    5 -----
> >  arch/mips/pci/ops-pmcmsp.c        |    2 +-
> >  arch/mips/pci/ops-tx3927.c        |    2 +-
> >  4 files changed, 3 insertions(+), 8 deletions(-)
> 
> > diff --git a/arch/mips/paravirt/paravirt-smp.c b/arch/mips/paravirt/paravirt-smp.c
> > index 73a123e..0164b0c 100644
> > --- a/arch/mips/paravirt/paravirt-smp.c
> > +++ b/arch/mips/paravirt/paravirt-smp.c
> > @@ -99,10 +99,6 @@ static void paravirt_smp_finish(void)
> >         local_irq_enable();
> >  }
> >
> > -static void paravirt_cpus_done(void)
> > -{
> > -}
> > -
> >  static void paravirt_boot_secondary(int cpu, struct task_struct *idle)
> >  {
> >         paravirt_smp_gp[cpu] = (unsigned long)task_thread_info(idle);
> > @@ -141,7 +137,6 @@ struct plat_smp_ops paravirt_smp_ops = {
> >         .send_ipi_mask          = paravirt_send_ipi_mask,
> >         .init_secondary         = paravirt_init_secondary,
> >         .smp_finish             = paravirt_smp_finish,
> > -       .cpus_done              = paravirt_cpus_done,
> >         .boot_secondary         = paravirt_boot_secondary,
> >         .smp_setup              = paravirt_smp_setup,
> >         .prepare_cpus           = paravirt_prepare_cpus,
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: mips: Accidental removal of paravirt_cpus_done?

[Ralf Baechle]

On Fri, Jun 13, 2014 at 12:02:30PM +0200, Geert Uytterhoeven wrote:

> It seems you accidentally assimilated an (unwanted?) kvm change in my
> patch:

I accidentally must have done a git commit --amend with the wrong
patch on top, sorry about that.  The change itself was intensional.

  Ralf