[PATCH 0/2] Fix 440 arch/ppc builds

[PATCH 0/2] Fix 440 arch/ppc builds

[Josh Boyer]

The following two patches fix arch/ppc 440 builds.  Unless some miracle
occurs and people stop breaking arch/ppc with commits, this will likely
be the last kernel where it builds.

josh

[PATCH 1/2] [PPC] 4xx: Fix duplicate phys_addr_t definition

[Josh Boyer]

Commit d04ceb3fc294ea2c4f538a04343f3a473953a3b0 moved phys_addr_t definitions
to include/asm-powerpc/types.h.  However, arch/ppc 440 builds had a duplicate
definition in include/asm-ppc/mmu.h that caused the build to fail.

This removes the duplicate definition in arch/ppc.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

---
 include/asm-ppc/mmu.h |    2 --
 1 file changed, 2 deletions(-)

--- linux-2.6.orig/include/asm-ppc/mmu.h
+++ linux-2.6/include/asm-ppc/mmu.h
@@ -15,10 +15,8 @@
  * physical need a larger than native word size type. -Matt
  */
 #ifndef CONFIG_PHYS_64BIT
-typedef unsigned long phys_addr_t;
 #define PHYS_FMT	"%.8lx"
 #else
-typedef unsigned long long phys_addr_t;
 extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t);
 #define PHYS_FMT	"%16Lx"
 #endif

[PATCH 2/2] [PPC] Add strncmp to arch/ppc

[Josh Boyer]

Commit 0119536cd314ef95553604208c25bc35581f7f0a added an assembly version
of strncmp to PowerPC.  However, it changed a common header file between
arch/ppc and arch/powerpc without adding strncmp to arch/ppc.  This fixes
that omission so that arch/ppc links again.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

---
 arch/ppc/kernel/ppc_ksyms.c |    1 +
 arch/ppc/lib/string.S       |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

--- linux-2.6.orig/arch/ppc/kernel/ppc_ksyms.c
+++ linux-2.6/arch/ppc/kernel/ppc_ksyms.c
@@ -89,6 +89,7 @@ EXPORT_SYMBOL(strncpy);
 EXPORT_SYMBOL(strcat);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(strcmp);
+EXPORT_SYMBOL(strncmp);
 
 EXPORT_SYMBOL(csum_partial);
 EXPORT_SYMBOL(csum_partial_copy_generic);
--- linux-2.6.orig/arch/ppc/lib/string.S
+++ linux-2.6/arch/ppc/lib/string.S
@@ -121,6 +121,20 @@ _GLOBAL(strcmp)
 	beq	1b
 	blr
 
+_GLOBAL(strncmp)
+	PPC_LCMPI r5,0
+	beqlr
+	mtctr	r5
+	addi	r5,r3,-1
+	addi	r4,r4,-1
+1:	lbzu	r3,1(r5)
+	cmpwi	1,r3,0
+	lbzu	r0,1(r4)
+	subf.	r3,r0,r3
+	beqlr	1
+	bdnzt	eq,1b
+	blr
+
 _GLOBAL(strlen)
 	addi	r4,r3,-1
 1:	lbzu	r0,1(r4)

Re: [PATCH 2/2] [PPC] Add strncmp to arch/ppc

[Grant Likely]

On Mon, Apr 21, 2008 at 6:50 PM, Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:
> Commit 0119536cd314ef95553604208c25bc35581f7f0a added an assembly version
>  of strncmp to PowerPC.  However, it changed a common header file between
>  arch/ppc and arch/powerpc without adding strncmp to arch/ppc.  This fixes
>  that omission so that arch/ppc links again.
>
>  Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

Acked-by: Grant Likely <grant.likely@secretlab.ca>

>
>  ---
>   arch/ppc/kernel/ppc_ksyms.c |    1 +
>   arch/ppc/lib/string.S       |   14 ++++++++++++++
>   2 files changed, 15 insertions(+)
>
>  --- linux-2.6.orig/arch/ppc/kernel/ppc_ksyms.c
>  +++ linux-2.6/arch/ppc/kernel/ppc_ksyms.c
>  @@ -89,6 +89,7 @@ EXPORT_SYMBOL(strncpy);
>   EXPORT_SYMBOL(strcat);
>   EXPORT_SYMBOL(strlen);
>   EXPORT_SYMBOL(strcmp);
>  +EXPORT_SYMBOL(strncmp);
>
>   EXPORT_SYMBOL(csum_partial);
>   EXPORT_SYMBOL(csum_partial_copy_generic);
>  --- linux-2.6.orig/arch/ppc/lib/string.S
>  +++ linux-2.6/arch/ppc/lib/string.S
>  @@ -121,6 +121,20 @@ _GLOBAL(strcmp)
>         beq     1b
>         blr
>
>  +_GLOBAL(strncmp)
>  +       PPC_LCMPI r5,0
>  +       beqlr
>  +       mtctr   r5
>  +       addi    r5,r3,-1
>  +       addi    r4,r4,-1
>  +1:     lbzu    r3,1(r5)
>  +       cmpwi   1,r3,0
>  +       lbzu    r0,1(r4)
>  +       subf.   r3,r0,r3
>  +       beqlr   1
>  +       bdnzt   eq,1b
>  +       blr
>  +
>   _GLOBAL(strlen)
>         addi    r4,r3,-1
>   1:     lbzu    r0,1(r4)
>
>  _______________________________________________
>  Linuxppc-dev mailing list
>  Linuxppc-dev@ozlabs.org
>  https://ozlabs.org/mailman/listinfo/linuxppc-dev
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.