linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] use correct register names in arch/ppc/kernel/relocate_kernel.S
@ 2005-06-29 13:01 Olaf Hering
  2005-06-29 18:08 ` Segher Boessenkool
  0 siblings, 1 reply; 3+ messages in thread
From: Olaf Hering @ 2005-06-29 13:01 UTC (permalink / raw)
  To: Andrew Morton, linuxppc-dev; +Cc: Eric Biederman


CONFIG_KEXEC=y doesnt work:

arch/ppc/kernel/relocate_kernel.S:37: Error: unsupported relocation against SRR1
arch/ppc/kernel/relocate_kernel.S:39: Error: unsupported relocation against SRR0

Signed-off-by: Olaf Hering <olh@suse.de>

Index: linux-2.6.13-rc1/arch/ppc/kernel/relocate_kernel.S
===================================================================
--- linux-2.6.13-rc1.orig/arch/ppc/kernel/relocate_kernel.S
+++ linux-2.6.13-rc1/arch/ppc/kernel/relocate_kernel.S
@@ -34,9 +34,9 @@ relocate_new_kernel:
 
 	mr	r8, r0
 	ori     r8, r8, MSR_RI|MSR_ME
-	mtspr	SRR1, r8
+	mtspr	SPRN_SRR1, r8
 	addi	r8, r4, 1f - relocate_new_kernel
-	mtspr	SRR0, r8
+	mtspr	SPRN_SRR0, r8
 	sync
 	rfi
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] use correct register names in arch/ppc/kernel/relocate_kernel.S
  2005-06-29 13:01 [PATCH] use correct register names in arch/ppc/kernel/relocate_kernel.S Olaf Hering
@ 2005-06-29 18:08 ` Segher Boessenkool
  2005-06-29 23:54   ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 3+ messages in thread
From: Segher Boessenkool @ 2005-06-29 18:08 UTC (permalink / raw)
  To: Olaf Hering; +Cc: Andrew Morton, linuxppc-dev, Eric Biederman

> --- linux-2.6.13-rc1.orig/arch/ppc/kernel/relocate_kernel.S
> +++ linux-2.6.13-rc1/arch/ppc/kernel/relocate_kernel.S
> @@ -34,9 +34,9 @@ relocate_new_kernel:
>
>  	mr	r8, r0
>  	ori     r8, r8, MSR_RI|MSR_ME
> -	mtspr	SRR1, r8
> +	mtspr	SPRN_SRR1, r8
>  	addi	r8, r4, 1f - relocate_new_kernel
> -	mtspr	SRR0, r8
> +	mtspr	SPRN_SRR0, r8
>  	sync
>  	rfi

Or just mtsrr0 c.q. mtsrr1.


Segher

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] use correct register names in arch/ppc/kernel/relocate_kernel.S
  2005-06-29 18:08 ` Segher Boessenkool
@ 2005-06-29 23:54   ` Benjamin Herrenschmidt
  0 siblings, 0 replies; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2005-06-29 23:54 UTC (permalink / raw)
  To: Segher Boessenkool
  Cc: Andrew Morton, linuxppc-dev, Eric Biederman, Olaf Hering

On Wed, 2005-06-29 at 20:08 +0200, Segher Boessenkool wrote:
> > --- linux-2.6.13-rc1.orig/arch/ppc/kernel/relocate_kernel.S
> > +++ linux-2.6.13-rc1/arch/ppc/kernel/relocate_kernel.S
> > @@ -34,9 +34,9 @@ relocate_new_kernel:
> >
> >  	mr	r8, r0
> >  	ori     r8, r8, MSR_RI|MSR_ME
> > -	mtspr	SRR1, r8
> > +	mtspr	SPRN_SRR1, r8
> >  	addi	r8, r4, 1f - relocate_new_kernel
> > -	mtspr	SRR0, r8
> > +	mtspr	SPRN_SRR0, r8
> >  	sync
> >  	rfi
> 
> Or just mtsrr0 c.q. mtsrr1

They are lovely but shits me when I grep for SPRN_SRR0 :) I tend to
prefer consistency here and so if we start using mtsrr0/1, then we
should change the whole kernel at once and not have a mix of SPRN_* and
mt*

Ben.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2005-06-30  0:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-06-29 13:01 [PATCH] use correct register names in arch/ppc/kernel/relocate_kernel.S Olaf Hering
2005-06-29 18:08 ` Segher Boessenkool
2005-06-29 23:54   ` Benjamin Herrenschmidt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).