Moved, renamed, and deleted files

The original directory structure was scattered and unorganized.
Changes are basically to make it look like kernel structure.

45 files changed, 0 insertions, 2992 deletions

diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/Makefile b/ANDROID_3.4.5/arch/powerpc/math-emu/Makefile
deleted file mode 100644
index 7d1dba0d..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-
-obj-$(CONFIG_MATH_EMULATION)	+= fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \
-					fctiw.o fctiwz.o fdiv.o fdivs.o \
-					fmadd.o fmadds.o fmsub.o fmsubs.o \
-					fmul.o fmuls.o fnabs.o fneg.o \
-					fnmadd.o fnmadds.o fnmsub.o fnmsubs.o \
-					fres.o frsp.o frsqrte.o fsel.o lfs.o \
-					fsqrt.o	fsqrts.o fsub.o fsubs.o \
-					mcrfs.o mffs.o mtfsb0.o mtfsb1.o \
-					mtfsf.o mtfsfi.o stfiwx.o stfs.o \
-					math.o fmr.o lfd.o stfd.o
-
-obj-$(CONFIG_SPE)		+= math_efp.o
-
-CFLAGS_fabs.o = -fno-builtin-fabs
-CFLAGS_math.o = -fno-builtin-fabs
-
-ccflags-y = -I. -Iinclude/math-emu -w
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fabs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fabs.c
deleted file mode 100644
index 549baba5..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fabs.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fabs(u32 *frD, u32 *frB)
-{
-	frD[0] = frB[0] & 0x7fffffff;
-	frD[1] = frB[1];
-
-#ifdef DEBUG
-	printk("%s: D %p, B %p: ", __func__, frD, frB);
-	dump_double(frD);
-	printk("\n");
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fadd.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fadd.c
deleted file mode 100644
index 0158a16e..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fadd.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fadd(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fadds.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fadds.c
deleted file mode 100644
index 5930f40a..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fadds.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fadds(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fcmpo.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fcmpo.c
deleted file mode 100644
index 5bce011c..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fcmpo.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_EX;
-	int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };
-	long cmp;
-
-#ifdef DEBUG
-	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	if (A_c == FP_CLS_NAN || B_c == FP_CLS_NAN)
-		FP_SET_EXCEPTION(EFLAG_VXVC);
-
-	FP_CMP_D(cmp, A, B, 2);
-	cmp = code[(cmp + 1) & 3];
-
-	__FPU_FPSCR &= ~(0x1f000);
-	__FPU_FPSCR |= (cmp << 12);
-
-	*ccr &= ~(15 << ((7 - crfD) << 2));
-	*ccr |= (cmp << ((7 - crfD) << 2));
-
-#ifdef DEBUG
-	printk("CR: %08x\n", *ccr);
-#endif
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fcmpu.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fcmpu.c
deleted file mode 100644
index d4fb1bab..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fcmpu.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fcmpu(u32 *ccr, int crfD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_EX;
-	int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };
-	long cmp;
-
-#ifdef DEBUG
-	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	FP_CMP_D(cmp, A, B, 2);
-	cmp = code[(cmp + 1) & 3];
-
-	__FPU_FPSCR &= ~(0x1f000);
-	__FPU_FPSCR |= (cmp << 12);
-
-	*ccr &= ~(15 << ((7 - crfD) << 2));
-	*ccr |= (cmp << ((7 - crfD) << 2));
-
-#ifdef DEBUG
-	printk("CR: %08x\n", *ccr);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fctiw.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fctiw.c
deleted file mode 100644
index f694440d..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fctiw.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fctiw(u32 *frD, void *frB)
-{
-	FP_DECL_D(B);
-	FP_DECL_EX;
-	unsigned int r;
-
-	FP_UNPACK_DP(B, frB);
-	FP_TO_INT_D(r, B, 32, 1);
-	frD[1] = r;
-
-#ifdef DEBUG
-	printk("%s: D %p, B %p: ", __func__, frD, frB);
-	dump_double(frD);
-	printk("\n");
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fctiwz.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fctiwz.c
deleted file mode 100644
index 71e782fd..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fctiwz.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fctiwz(u32 *frD, void *frB)
-{
-	FP_DECL_D(B);
-	FP_DECL_EX;
-	u32 fpscr;
-	unsigned int r;
-
-	fpscr = __FPU_FPSCR;
-	__FPU_FPSCR &= ~(3);
-	__FPU_FPSCR |= FP_RND_ZERO;
-
-	FP_UNPACK_DP(B, frB);
-	FP_TO_INT_D(r, B, 32, 1);
-	frD[1] = r;
-
-	__FPU_FPSCR = fpscr;
-
-#ifdef DEBUG
-	printk("%s: D %p, B %p: ", __func__, frD, frB);
-	dump_double(frD);
-	printk("\n");
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fdiv.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fdiv.c
deleted file mode 100644
index a29239c0..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fdiv.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fdiv(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
-		FP_SET_EXCEPTION(EFLAG_VXZDZ);
-#ifdef DEBUG
-		printk("%s: FPSCR_VXZDZ raised\n", __func__);
-#endif
-	}
-	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
-		FP_SET_EXCEPTION(EFLAG_VXIDI);
-#ifdef DEBUG
-		printk("%s: FPSCR_VXIDI raised\n", __func__);
-#endif
-	}
-
-	if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {
-		FP_SET_EXCEPTION(EFLAG_DIVZERO);
-		if (__FPU_TRAP_P(EFLAG_DIVZERO))
-			return FP_CUR_EXCEPTIONS;
-	}
-	FP_DIV_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fdivs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fdivs.c
deleted file mode 100644
index 526bc261..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fdivs.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fdivs(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
-		FP_SET_EXCEPTION(EFLAG_VXZDZ);
-#ifdef DEBUG
-		printk("%s: FPSCR_VXZDZ raised\n", __func__);
-#endif
-	}
-	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
-		FP_SET_EXCEPTION(EFLAG_VXIDI);
-#ifdef DEBUG
-		printk("%s: FPSCR_VXIDI raised\n", __func__);
-#endif
-	}
-
-	if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {
-		FP_SET_EXCEPTION(EFLAG_DIVZERO);
-		if (__FPU_TRAP_P(EFLAG_DIVZERO))
-			return FP_CUR_EXCEPTIONS;
-	}
-
-	FP_DIV_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fmadd.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fmadd.c
deleted file mode 100644
index 8c3f20aa..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fmadd.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fmadd(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fmadds.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fmadds.c
deleted file mode 100644
index 794fb31e..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fmadds.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fmadds(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fmr.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fmr.c
deleted file mode 100644
index bd55384b..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fmr.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fmr(u32 *frD, u32 *frB)
-{
-	frD[0] = frB[0];
-	frD[1] = frB[1];
-
-#ifdef DEBUG
-	printk("%s: D %p, B %p: ", __func__, frD, frB);
-	dump_double(frD);
-	printk("\n");
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fmsub.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fmsub.c
deleted file mode 100644
index 626f6fed..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fmsub.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fmsub(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-		FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (B_c != FP_CLS_NAN)
-		B_s ^= 1;
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fmsubs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fmsubs.c
deleted file mode 100644
index 3425bc89..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fmsubs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fmsubs(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-		FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (B_c != FP_CLS_NAN)
-		B_s ^= 1;
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fmul.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fmul.c
deleted file mode 100644
index 2c192977..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fmul.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fmul(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-	       A_s, A_f1, A_f0, A_e, A_c, A_f1, A_f0, A_e + 1023);
-	printk("B: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-	       B_s, B_f1, B_f0, B_e, B_c, B_f1, B_f0, B_e + 1023);
-#endif
-
-	if ((A_c == FP_CLS_INF && B_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && B_c == FP_CLS_INF))
-		FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-	       R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fmuls.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fmuls.c
deleted file mode 100644
index f5ad5c9c..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fmuls.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fmuls(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-	       A_s, A_f1, A_f0, A_e, A_c, A_f1, A_f0, A_e + 1023);
-	printk("B: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-	       B_s, B_f1, B_f0, B_e, B_c, B_f1, B_f0, B_e + 1023);
-#endif
-
-	if ((A_c == FP_CLS_INF && B_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && B_c == FP_CLS_INF))
-		FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
-	       R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fnabs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fnabs.c
deleted file mode 100644
index a7d34f3d..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fnabs.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fnabs(u32 *frD, u32 *frB)
-{
-	frD[0] = frB[0] | 0x80000000;
-	frD[1] = frB[1];
-
-#ifdef DEBUG
-	printk("%s: D %p, B %p: ", __func__, frD, frB);
-	dump_double(frD);
-	printk("\n");
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fneg.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fneg.c
deleted file mode 100644
index 1e988cd9..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fneg.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fneg(u32 *frD, u32 *frB)
-{
-	frD[0] = frB[0] ^ 0x80000000;
-	frD[1] = frB[1];
-
-#ifdef DEBUG
-	printk("%s: D %p, B %p: ", __func__, frD, frB);
-	dump_double(frD);
-	printk("\n");
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmadd.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fnmadd.c
deleted file mode 100644
index e817bc54..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmadd.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fnmadd(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-	if (R_c != FP_CLS_NAN)
-		R_s ^= 1;
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmadds.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fnmadds.c
deleted file mode 100644
index 4db4b7d9..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmadds.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fnmadds(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-                FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-	if (R_c != FP_CLS_NAN)
-		R_s ^= 1;
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmsub.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fnmsub.c
deleted file mode 100644
index f65979fa..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmsub.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fnmsub(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-		FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (B_c != FP_CLS_NAN)
-		B_s ^= 1;
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-	if (R_c != FP_CLS_NAN)
-		R_s ^= 1;
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmsubs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fnmsubs.c
deleted file mode 100644
index 9021dacc..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fnmsubs.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fnmsubs(void *frD, void *frA, void *frB, void *frC)
-{
-	FP_DECL_D(R);
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(C);
-	FP_DECL_D(T);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-	FP_UNPACK_DP(C, frC);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-	printk("C: %ld %lu %lu %ld (%ld)\n", C_s, C_f1, C_f0, C_e, C_c);
-#endif
-
-	if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
-	    (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-		FP_SET_EXCEPTION(EFLAG_VXIMZ);
-
-	FP_MUL_D(T, A, C);
-
-	if (B_c != FP_CLS_NAN)
-		B_s ^= 1;
-
-	if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, T, B);
-
-	if (R_c != FP_CLS_NAN)
-		R_s ^= 1;
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fres.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fres.c
deleted file mode 100644
index 10ecbd08..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fres.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-fres(void *frD, void *frB)
-{
-#ifdef DEBUG
-	printk("%s: %p %p\n", __func__, frD, frB);
-#endif
-	return -ENOSYS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/frsp.c b/ANDROID_3.4.5/arch/powerpc/math-emu/frsp.c
deleted file mode 100644
index ddcc1466..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/frsp.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-frsp(void *frD, void *frB)
-{
-	FP_DECL_D(B);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: D %p, B %p\n", __func__, frD, frB);
-#endif
-
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	__FP_PACK_DS(frD, B);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/frsqrte.c b/ANDROID_3.4.5/arch/powerpc/math-emu/frsqrte.c
deleted file mode 100644
index 1d0a3a0f..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/frsqrte.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-frsqrte(void *frD, void *frB)
-{
-#ifdef DEBUG
-	printk("%s: %p %p\n", __func__, frD, frB);
-#endif
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fsel.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fsel.c
deleted file mode 100644
index 1b0c1449..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fsel.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fsel(u32 *frD, void *frA, u32 *frB, u32 *frC)
-{
-	FP_DECL_D(A);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %08x %08x\n", frB[0], frB[1]);
-	printk("C: %08x %08x\n", frC[0], frC[1]);
-#endif
-
-	if (A_c == FP_CLS_NAN || (A_c != FP_CLS_ZERO && A_s)) {
-		frD[0] = frB[0];
-		frD[1] = frB[1];
-	} else {
-		frD[0] = frC[0];
-		frD[1] = frC[1];
-	}
-
-#ifdef DEBUG
-	printk("D: %08x.%08x\n", frD[0], frD[1]);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fsqrt.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fsqrt.c
deleted file mode 100644
index a55fc7d4..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fsqrt.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fsqrt(void *frD, void *frB)
-{
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frB);
-#endif
-
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	if (B_s && B_c != FP_CLS_ZERO)
-		FP_SET_EXCEPTION(EFLAG_VXSQRT);
-	if (B_c == FP_CLS_NAN)
-		FP_SET_EXCEPTION(EFLAG_VXSNAN);
-
-	FP_SQRT_D(R, B);
-
-#ifdef DEBUG
-	printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fsqrts.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fsqrts.c
deleted file mode 100644
index 31dccbfc..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fsqrts.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fsqrts(void *frD, void *frB)
-{
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p %p\n", __func__, frD, frB);
-#endif
-
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	if (B_s && B_c != FP_CLS_ZERO)
-		FP_SET_EXCEPTION(EFLAG_VXSQRT);
-	if (B_c == FP_CLS_NAN)
-		FP_SET_EXCEPTION(EFLAG_VXSNAN);
-
-	FP_SQRT_D(R, B);
-
-#ifdef DEBUG
-	printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fsub.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fsub.c
deleted file mode 100644
index 02c5dff4..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fsub.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-
-int
-fsub(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	if (B_c != FP_CLS_NAN)
-		B_s ^= 1;
-
-	if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_D(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/fsubs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/fsubs.c
deleted file mode 100644
index 5d9b18c3..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/fsubs.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-fsubs(void *frD, void *frA, void *frB)
-{
-	FP_DECL_D(A);
-	FP_DECL_D(B);
-	FP_DECL_D(R);
-	FP_DECL_EX;
-
-#ifdef DEBUG
-	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
-#endif
-
-	FP_UNPACK_DP(A, frA);
-	FP_UNPACK_DP(B, frB);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-	printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
-#endif
-
-	if (B_c != FP_CLS_NAN)
-		B_s ^= 1;
-
-	if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-		FP_SET_EXCEPTION(EFLAG_VXISI);
-
-	FP_ADD_D(R, A, B);
-
-#ifdef DEBUG
-	printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	__FP_PACK_DS(frD, R);
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/lfd.c b/ANDROID_3.4.5/arch/powerpc/math-emu/lfd.c
deleted file mode 100644
index 79ac76d5..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/lfd.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/double.h>
-
-int
-lfd(void *frD, void *ea)
-{
-	if (copy_from_user(frD, ea, sizeof(double)))
-		return -EFAULT;
-#ifdef DEBUG
-	printk("%s: D %p, ea %p: ", __func__, frD, ea);
-	dump_double(frD);
-	printk("\n");
-#endif
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/lfs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/lfs.c
deleted file mode 100644
index 434ed27b..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/lfs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-lfs(void *frD, void *ea)
-{
-	FP_DECL_D(R);
-	FP_DECL_S(A);
-	FP_DECL_EX;
-	float f;
-
-#ifdef DEBUG
-	printk("%s: D %p, ea %p\n", __func__, frD, ea);
-#endif
-
-	if (copy_from_user(&f, ea, sizeof(float)))
-		return -EFAULT;
-
-	FP_UNPACK_S(A, f);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %ld (%ld) [%08lx]\n", A_s, A_f, A_e, A_c,
-	       *(unsigned long *)&f);
-#endif
-
-	FP_CONV(D, S, 2, 1, R, A);
-
-#ifdef DEBUG
-	printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
-#endif
-
-	if (R_c == FP_CLS_NAN) {
-		R_e = _FP_EXPMAX_D;
-		_FP_PACK_RAW_2_P(D, frD, R);
-	} else {
-		__FP_PACK_D(frD, R);
-	}
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/math.c b/ANDROID_3.4.5/arch/powerpc/math-emu/math.c
deleted file mode 100644
index 164d5593..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/math.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright (C) 1999  Eddie C. Dost  (ecd@atecom.com)
- */
-
-#include <linux/types.h>
-#include <linux/sched.h>
-
-#include <asm/uaccess.h>
-#include <asm/reg.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/double.h>
-
-#define FLOATFUNC(x)	extern int x(void *, void *, void *, void *)
-
-FLOATFUNC(fadd);
-FLOATFUNC(fadds);
-FLOATFUNC(fdiv);
-FLOATFUNC(fdivs);
-FLOATFUNC(fmul);
-FLOATFUNC(fmuls);
-FLOATFUNC(fsub);
-FLOATFUNC(fsubs);
-
-FLOATFUNC(fmadd);
-FLOATFUNC(fmadds);
-FLOATFUNC(fmsub);
-FLOATFUNC(fmsubs);
-FLOATFUNC(fnmadd);
-FLOATFUNC(fnmadds);
-FLOATFUNC(fnmsub);
-FLOATFUNC(fnmsubs);
-
-FLOATFUNC(fctiw);
-FLOATFUNC(fctiwz);
-FLOATFUNC(frsp);
-
-FLOATFUNC(fcmpo);
-FLOATFUNC(fcmpu);
-
-FLOATFUNC(mcrfs);
-FLOATFUNC(mffs);
-FLOATFUNC(mtfsb0);
-FLOATFUNC(mtfsb1);
-FLOATFUNC(mtfsf);
-FLOATFUNC(mtfsfi);
-
-FLOATFUNC(lfd);
-FLOATFUNC(lfs);
-
-FLOATFUNC(stfd);
-FLOATFUNC(stfs);
-FLOATFUNC(stfiwx);
-
-FLOATFUNC(fabs);
-FLOATFUNC(fmr);
-FLOATFUNC(fnabs);
-FLOATFUNC(fneg);
-
-/* Optional */
-FLOATFUNC(fres);
-FLOATFUNC(frsqrte);
-FLOATFUNC(fsel);
-FLOATFUNC(fsqrt);
-FLOATFUNC(fsqrts);
-
-
-#define OP31		0x1f		/*   31 */
-#define LFS		0x30		/*   48 */
-#define LFSU		0x31		/*   49 */
-#define LFD		0x32		/*   50 */
-#define LFDU		0x33		/*   51 */
-#define STFS		0x34		/*   52 */
-#define STFSU		0x35		/*   53 */
-#define STFD		0x36		/*   54 */
-#define STFDU		0x37		/*   55 */
-#define OP59		0x3b		/*   59 */
-#define OP63		0x3f		/*   63 */
-
-/* Opcode 31: */
-/* X-Form: */
-#define LFSX		0x217		/*  535 */
-#define LFSUX		0x237		/*  567 */
-#define LFDX		0x257		/*  599 */
-#define LFDUX		0x277		/*  631 */
-#define STFSX		0x297		/*  663 */
-#define STFSUX		0x2b7		/*  695 */
-#define STFDX		0x2d7		/*  727 */
-#define STFDUX		0x2f7		/*  759 */
-#define STFIWX		0x3d7		/*  983 */
-
-/* Opcode 59: */
-/* A-Form: */
-#define FDIVS		0x012		/*   18 */
-#define FSUBS		0x014		/*   20 */
-#define FADDS		0x015		/*   21 */
-#define FSQRTS		0x016		/*   22 */
-#define FRES		0x018		/*   24 */
-#define FMULS		0x019		/*   25 */
-#define FMSUBS		0x01c		/*   28 */
-#define FMADDS		0x01d		/*   29 */
-#define FNMSUBS		0x01e		/*   30 */
-#define FNMADDS		0x01f		/*   31 */
-
-/* Opcode 63: */
-/* A-Form: */
-#define FDIV		0x012		/*   18 */
-#define FSUB		0x014		/*   20 */
-#define FADD		0x015		/*   21 */
-#define FSQRT		0x016		/*   22 */
-#define FSEL		0x017		/*   23 */
-#define FMUL		0x019		/*   25 */
-#define FRSQRTE		0x01a		/*   26 */
-#define FMSUB		0x01c		/*   28 */
-#define FMADD		0x01d		/*   29 */
-#define FNMSUB		0x01e		/*   30 */
-#define FNMADD		0x01f		/*   31 */
-
-/* X-Form: */
-#define FCMPU		0x000		/*    0	*/
-#define FRSP		0x00c		/*   12 */
-#define FCTIW		0x00e		/*   14 */
-#define FCTIWZ		0x00f		/*   15 */
-#define FCMPO		0x020		/*   32 */
-#define MTFSB1		0x026		/*   38 */
-#define FNEG		0x028		/*   40 */
-#define MCRFS		0x040		/*   64 */
-#define MTFSB0		0x046		/*   70 */
-#define FMR		0x048		/*   72 */
-#define MTFSFI		0x086		/*  134 */
-#define FNABS		0x088		/*  136 */
-#define FABS		0x108		/*  264 */
-#define MFFS		0x247		/*  583 */
-#define MTFSF		0x2c7		/*  711 */
-
-
-#define AB	2
-#define AC	3
-#define ABC	4
-#define D	5
-#define DU	6
-#define X	7
-#define XA	8
-#define XB	9
-#define XCR	11
-#define XCRB	12
-#define XCRI	13
-#define XCRL	16
-#define XE	14
-#define XEU	15
-#define XFLB	10
-
-#ifdef CONFIG_MATH_EMULATION
-static int
-record_exception(struct pt_regs *regs, int eflag)
-{
-	u32 fpscr;
-
-	fpscr = __FPU_FPSCR;
-
-	if (eflag) {
-		fpscr |= FPSCR_FX;
-		if (eflag & EFLAG_OVERFLOW)
-			fpscr |= FPSCR_OX;
-		if (eflag & EFLAG_UNDERFLOW)
-			fpscr |= FPSCR_UX;
-		if (eflag & EFLAG_DIVZERO)
-			fpscr |= FPSCR_ZX;
-		if (eflag & EFLAG_INEXACT)
-			fpscr |= FPSCR_XX;
-		if (eflag & EFLAG_INVALID)
-			fpscr |= FPSCR_VX;
-		if (eflag & EFLAG_VXSNAN)
-			fpscr |= FPSCR_VXSNAN;
-		if (eflag & EFLAG_VXISI)
-			fpscr |= FPSCR_VXISI;
-		if (eflag & EFLAG_VXIDI)
-			fpscr |= FPSCR_VXIDI;
-		if (eflag & EFLAG_VXZDZ)
-			fpscr |= FPSCR_VXZDZ;
-		if (eflag & EFLAG_VXIMZ)
-			fpscr |= FPSCR_VXIMZ;
-		if (eflag & EFLAG_VXVC)
-			fpscr |= FPSCR_VXVC;
-		if (eflag & EFLAG_VXSOFT)
-			fpscr |= FPSCR_VXSOFT;
-		if (eflag & EFLAG_VXSQRT)
-			fpscr |= FPSCR_VXSQRT;
-		if (eflag & EFLAG_VXCVI)
-			fpscr |= FPSCR_VXCVI;
-	}
-
-//	fpscr &= ~(FPSCR_VX);
-	if (fpscr & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
-		     FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |
-		     FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))
-		fpscr |= FPSCR_VX;
-
-	fpscr &= ~(FPSCR_FEX);
-	if (((fpscr & FPSCR_VX) && (fpscr & FPSCR_VE)) ||
-	    ((fpscr & FPSCR_OX) && (fpscr & FPSCR_OE)) ||
-	    ((fpscr & FPSCR_UX) && (fpscr & FPSCR_UE)) ||
-	    ((fpscr & FPSCR_ZX) && (fpscr & FPSCR_ZE)) ||
-	    ((fpscr & FPSCR_XX) && (fpscr & FPSCR_XE)))
-		fpscr |= FPSCR_FEX;
-
-	__FPU_FPSCR = fpscr;
-
-	return (fpscr & FPSCR_FEX) ? 1 : 0;
-}
-#endif /* CONFIG_MATH_EMULATION */
-
-int
-do_mathemu(struct pt_regs *regs)
-{
-	void *op0 = 0, *op1 = 0, *op2 = 0, *op3 = 0;
-	unsigned long pc = regs->nip;
-	signed short sdisp;
-	u32 insn = 0;
-	int idx = 0;
-#ifdef CONFIG_MATH_EMULATION
-	int (*func)(void *, void *, void *, void *);
-	int type = 0;
-	int eflag, trap;
-#endif
-
-	if (get_user(insn, (u32 *)pc))
-		return -EFAULT;
-
-#ifndef CONFIG_MATH_EMULATION
-	switch (insn >> 26) {
-	case LFD:
-		idx = (insn >> 16) & 0x1f;
-		sdisp = (insn & 0xffff);
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-		lfd(op0, op1, op2, op3);
-		break;
-	case LFDU:
-		idx = (insn >> 16) & 0x1f;
-		sdisp = (insn & 0xffff);
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-		lfd(op0, op1, op2, op3);
-		regs->gpr[idx] = (unsigned long)op1;
-		break;
-	case STFD:
-		idx = (insn >> 16) & 0x1f;
-		sdisp = (insn & 0xffff);
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-		stfd(op0, op1, op2, op3);
-		break;
-	case STFDU:
-		idx = (insn >> 16) & 0x1f;
-		sdisp = (insn & 0xffff);
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-		stfd(op0, op1, op2, op3);
-		regs->gpr[idx] = (unsigned long)op1;
-		break;
-	case OP63:
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
-		fmr(op0, op1, op2, op3);
-		break;
-	default:
-		goto illegal;
-	}
-#else /* CONFIG_MATH_EMULATION */
-	switch (insn >> 26) {
-	case LFS:	func = lfs;	type = D;	break;
-	case LFSU:	func = lfs;	type = DU;	break;
-	case LFD:	func = lfd;	type = D;	break;
-	case LFDU:	func = lfd;	type = DU;	break;
-	case STFS:	func = stfs;	type = D;	break;
-	case STFSU:	func = stfs;	type = DU;	break;
-	case STFD:	func = stfd;	type = D;	break;
-	case STFDU:	func = stfd;	type = DU;	break;
-
-	case OP31:
-		switch ((insn >> 1) & 0x3ff) {
-		case LFSX:	func = lfs;	type = XE;	break;
-		case LFSUX:	func = lfs;	type = XEU;	break;
-		case LFDX:	func = lfd;	type = XE;	break;
-		case LFDUX:	func = lfd;	type = XEU;	break;
-		case STFSX:	func = stfs;	type = XE;	break;
-		case STFSUX:	func = stfs;	type = XEU;	break;
-		case STFDX:	func = stfd;	type = XE;	break;
-		case STFDUX:	func = stfd;	type = XEU;	break;
-		case STFIWX:	func = stfiwx;	type = XE;	break;
-		default:
-			goto illegal;
-		}
-		break;
-
-	case OP59:
-		switch ((insn >> 1) & 0x1f) {
-		case FDIVS:	func = fdivs;	type = AB;	break;
-		case FSUBS:	func = fsubs;	type = AB;	break;
-		case FADDS:	func = fadds;	type = AB;	break;
-		case FSQRTS:	func = fsqrts;	type = AB;	break;
-		case FRES:	func = fres;	type = AB;	break;
-		case FMULS:	func = fmuls;	type = AC;	break;
-		case FMSUBS:	func = fmsubs;	type = ABC;	break;
-		case FMADDS:	func = fmadds;	type = ABC;	break;
-		case FNMSUBS:	func = fnmsubs;	type = ABC;	break;
-		case FNMADDS:	func = fnmadds;	type = ABC;	break;
-		default:
-			goto illegal;
-		}
-		break;
-
-	case OP63:
-		if (insn & 0x20) {
-			switch ((insn >> 1) & 0x1f) {
-			case FDIV:	func = fdiv;	type = AB;	break;
-			case FSUB:	func = fsub;	type = AB;	break;
-			case FADD:	func = fadd;	type = AB;	break;
-			case FSQRT:	func = fsqrt;	type = AB;	break;
-			case FSEL:	func = fsel;	type = ABC;	break;
-			case FMUL:	func = fmul;	type = AC;	break;
-			case FRSQRTE:	func = frsqrte;	type = AB;	break;
-			case FMSUB:	func = fmsub;	type = ABC;	break;
-			case FMADD:	func = fmadd;	type = ABC;	break;
-			case FNMSUB:	func = fnmsub;	type = ABC;	break;
-			case FNMADD:	func = fnmadd;	type = ABC;	break;
-			default:
-				goto illegal;
-			}
-			break;
-		}
-
-		switch ((insn >> 1) & 0x3ff) {
-		case FCMPU:	func = fcmpu;	type = XCR;	break;
-		case FRSP:	func = frsp;	type = XB;	break;
-		case FCTIW:	func = fctiw;	type = XB;	break;
-		case FCTIWZ:	func = fctiwz;	type = XB;	break;
-		case FCMPO:	func = fcmpo;	type = XCR;	break;
-		case MTFSB1:	func = mtfsb1;	type = XCRB;	break;
-		case FNEG:	func = fneg;	type = XB;	break;
-		case MCRFS:	func = mcrfs;	type = XCRL;	break;
-		case MTFSB0:	func = mtfsb0;	type = XCRB;	break;
-		case FMR:	func = fmr;	type = XB;	break;
-		case MTFSFI:	func = mtfsfi;	type = XCRI;	break;
-		case FNABS:	func = fnabs;	type = XB;	break;
-		case FABS:	func = fabs;	type = XB;	break;
-		case MFFS:	func = mffs;	type = X;	break;
-		case MTFSF:	func = mtfsf;	type = XFLB;	break;
-		default:
-			goto illegal;
-		}
-		break;
-
-	default:
-		goto illegal;
-	}
-
-	switch (type) {
-	case AB:
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
-		op2 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
-		break;
-
-	case AC:
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
-		op2 = (void *)&current->thread.TS_FPR((insn >>  6) & 0x1f);
-		break;
-
-	case ABC:
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
-		op2 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
-		op3 = (void *)&current->thread.TS_FPR((insn >>  6) & 0x1f);
-		break;
-
-	case D:
-		idx = (insn >> 16) & 0x1f;
-		sdisp = (insn & 0xffff);
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-		break;
-
-	case DU:
-		idx = (insn >> 16) & 0x1f;
-		if (!idx)
-			goto illegal;
-
-		sdisp = (insn & 0xffff);
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)(regs->gpr[idx] + sdisp);
-		break;
-
-	case X:
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		break;
-
-	case XA:
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
-		break;
-
-	case XB:
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
-		break;
-
-	case XE:
-		idx = (insn >> 16) & 0x1f;
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		if (!idx) {
-			if (((insn >> 1) & 0x3ff) == STFIWX)
-				op1 = (void *)(regs->gpr[(insn >> 11) & 0x1f]);
-			else
-				goto illegal;
-		} else {
-			op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]);
-		}
-
-		break;
-
-	case XEU:
-		idx = (insn >> 16) & 0x1f;
-		op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-		op1 = (void *)((idx ? regs->gpr[idx] : 0)
-				+ regs->gpr[(insn >> 11) & 0x1f]);
-		break;
-
-	case XCR:
-		op0 = (void *)&regs->ccr;
-		op1 = (void *)((insn >> 23) & 0x7);
-		op2 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
-		op3 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
-		break;
-
-	case XCRL:
-		op0 = (void *)&regs->ccr;
-		op1 = (void *)((insn >> 23) & 0x7);
-		op2 = (void *)((insn >> 18) & 0x7);
-		break;
-
-	case XCRB:
-		op0 = (void *)((insn >> 21) & 0x1f);
-		break;
-
-	case XCRI:
-		op0 = (void *)((insn >> 23) & 0x7);
-		op1 = (void *)((insn >> 12) & 0xf);
-		break;
-
-	case XFLB:
-		op0 = (void *)((insn >> 17) & 0xff);
-		op1 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
-		break;
-
-	default:
-		goto illegal;
-	}
-
-	eflag = func(op0, op1, op2, op3);
-
-	if (insn & 1) {
-		regs->ccr &= ~(0x0f000000);
-		regs->ccr |= (__FPU_FPSCR >> 4) & 0x0f000000;
-	}
-
-	trap = record_exception(regs, eflag);
-	if (trap)
-		return 1;
-
-	switch (type) {
-	case DU:
-	case XEU:
-		regs->gpr[idx] = (unsigned long)op1;
-		break;
-
-	default:
-		break;
-	}
-#endif /* CONFIG_MATH_EMULATION */
-
-	regs->nip += 4;
-	return 0;
-
-illegal:
-	return -ENOSYS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/math_efp.c b/ANDROID_3.4.5/arch/powerpc/math-emu/math_efp.c
deleted file mode 100644
index a73f0884..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/math_efp.c
+++ /dev/null
@@ -1,771 +0,0 @@
-/*
- * arch/powerpc/math-emu/math_efp.c
- *
- * Copyright (C) 2006-2008, 2010 Freescale Semiconductor, Inc.
- *
- * Author: Ebony Zhu,	<ebony.zhu@freescale.com>
- *         Yu Liu,	<yu.liu@freescale.com>
- *
- * Derived from arch/alpha/math-emu/math.c
- *              arch/powerpc/math-emu/math.c
- *
- * Description:
- * This file is the exception handler to make E500 SPE instructions
- * fully comply with IEEE-754 floating point standard.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/types.h>
-
-#include <asm/uaccess.h>
-#include <asm/reg.h>
-
-#define FP_EX_BOOKE_E500_SPE
-#include <asm/sfp-machine.h>
-
-#include <math-emu/soft-fp.h>
-#include <math-emu/single.h>
-#include <math-emu/double.h>
-
-#define EFAPU		0x4
-
-#define VCT		0x4
-#define SPFP		0x6
-#define DPFP		0x7
-
-#define EFSADD		0x2c0
-#define EFSSUB		0x2c1
-#define EFSABS		0x2c4
-#define EFSNABS		0x2c5
-#define EFSNEG		0x2c6
-#define EFSMUL		0x2c8
-#define EFSDIV		0x2c9
-#define EFSCMPGT	0x2cc
-#define EFSCMPLT	0x2cd
-#define EFSCMPEQ	0x2ce
-#define EFSCFD		0x2cf
-#define EFSCFSI		0x2d1
-#define EFSCTUI		0x2d4
-#define EFSCTSI		0x2d5
-#define EFSCTUF		0x2d6
-#define EFSCTSF		0x2d7
-#define EFSCTUIZ	0x2d8
-#define EFSCTSIZ	0x2da
-
-#define EVFSADD		0x280
-#define EVFSSUB		0x281
-#define EVFSABS		0x284
-#define EVFSNABS	0x285
-#define EVFSNEG		0x286
-#define EVFSMUL		0x288
-#define EVFSDIV		0x289
-#define EVFSCMPGT	0x28c
-#define EVFSCMPLT	0x28d
-#define EVFSCMPEQ	0x28e
-#define EVFSCTUI	0x294
-#define EVFSCTSI	0x295
-#define EVFSCTUF	0x296
-#define EVFSCTSF	0x297
-#define EVFSCTUIZ	0x298
-#define EVFSCTSIZ	0x29a
-
-#define EFDADD		0x2e0
-#define EFDSUB		0x2e1
-#define EFDABS		0x2e4
-#define EFDNABS		0x2e5
-#define EFDNEG		0x2e6
-#define EFDMUL		0x2e8
-#define EFDDIV		0x2e9
-#define EFDCTUIDZ	0x2ea
-#define EFDCTSIDZ	0x2eb
-#define EFDCMPGT	0x2ec
-#define EFDCMPLT	0x2ed
-#define EFDCMPEQ	0x2ee
-#define EFDCFS		0x2ef
-#define EFDCTUI		0x2f4
-#define EFDCTSI		0x2f5
-#define EFDCTUF		0x2f6
-#define EFDCTSF		0x2f7
-#define EFDCTUIZ	0x2f8
-#define EFDCTSIZ	0x2fa
-
-#define AB	2
-#define XA	3
-#define XB	4
-#define XCR	5
-#define NOTYPE	0
-
-#define SIGN_BIT_S	(1UL << 31)
-#define SIGN_BIT_D	(1ULL << 63)
-#define FP_EX_MASK	(FP_EX_INEXACT | FP_EX_INVALID | FP_EX_DIVZERO | \
-			FP_EX_UNDERFLOW | FP_EX_OVERFLOW)
-
-static int have_e500_cpu_a005_erratum;
-
-union dw_union {
-	u64 dp[1];
-	u32 wp[2];
-};
-
-static unsigned long insn_type(unsigned long speinsn)
-{
-	unsigned long ret = NOTYPE;
-
-	switch (speinsn & 0x7ff) {
-	case EFSABS:	ret = XA;	break;
-	case EFSADD:	ret = AB;	break;
-	case EFSCFD:	ret = XB;	break;
-	case EFSCMPEQ:	ret = XCR;	break;
-	case EFSCMPGT:	ret = XCR;	break;
-	case EFSCMPLT:	ret = XCR;	break;
-	case EFSCTSF:	ret = XB;	break;
-	case EFSCTSI:	ret = XB;	break;
-	case EFSCTSIZ:	ret = XB;	break;
-	case EFSCTUF:	ret = XB;	break;
-	case EFSCTUI:	ret = XB;	break;
-	case EFSCTUIZ:	ret = XB;	break;
-	case EFSDIV:	ret = AB;	break;
-	case EFSMUL:	ret = AB;	break;
-	case EFSNABS:	ret = XA;	break;
-	case EFSNEG:	ret = XA;	break;
-	case EFSSUB:	ret = AB;	break;
-	case EFSCFSI:	ret = XB;	break;
-
-	case EVFSABS:	ret = XA;	break;
-	case EVFSADD:	ret = AB;	break;
-	case EVFSCMPEQ:	ret = XCR;	break;
-	case EVFSCMPGT:	ret = XCR;	break;
-	case EVFSCMPLT:	ret = XCR;	break;
-	case EVFSCTSF:	ret = XB;	break;
-	case EVFSCTSI:	ret = XB;	break;
-	case EVFSCTSIZ:	ret = XB;	break;
-	case EVFSCTUF:	ret = XB;	break;
-	case EVFSCTUI:	ret = XB;	break;
-	case EVFSCTUIZ:	ret = XB;	break;
-	case EVFSDIV:	ret = AB;	break;
-	case EVFSMUL:	ret = AB;	break;
-	case EVFSNABS:	ret = XA;	break;
-	case EVFSNEG:	ret = XA;	break;
-	case EVFSSUB:	ret = AB;	break;
-
-	case EFDABS:	ret = XA;	break;
-	case EFDADD:	ret = AB;	break;
-	case EFDCFS:	ret = XB;	break;
-	case EFDCMPEQ:	ret = XCR;	break;
-	case EFDCMPGT:	ret = XCR;	break;
-	case EFDCMPLT:	ret = XCR;	break;
-	case EFDCTSF:	ret = XB;	break;
-	case EFDCTSI:	ret = XB;	break;
-	case EFDCTSIDZ:	ret = XB;	break;
-	case EFDCTSIZ:	ret = XB;	break;
-	case EFDCTUF:	ret = XB;	break;
-	case EFDCTUI:	ret = XB;	break;
-	case EFDCTUIDZ:	ret = XB;	break;
-	case EFDCTUIZ:	ret = XB;	break;
-	case EFDDIV:	ret = AB;	break;
-	case EFDMUL:	ret = AB;	break;
-	case EFDNABS:	ret = XA;	break;
-	case EFDNEG:	ret = XA;	break;
-	case EFDSUB:	ret = AB;	break;
-	}
-
-	return ret;
-}
-
-int do_spe_mathemu(struct pt_regs *regs)
-{
-	FP_DECL_EX;
-	int IR, cmp;
-
-	unsigned long type, func, fc, fa, fb, src, speinsn;
-	union dw_union vc, va, vb;
-
-	if (get_user(speinsn, (unsigned int __user *) regs->nip))
-		return -EFAULT;
-	if ((speinsn >> 26) != EFAPU)
-		return -EINVAL;         /* not an spe instruction */
-
-	type = insn_type(speinsn);
-	if (type == NOTYPE)
-		goto illegal;
-
-	func = speinsn & 0x7ff;
-	fc = (speinsn >> 21) & 0x1f;
-	fa = (speinsn >> 16) & 0x1f;
-	fb = (speinsn >> 11) & 0x1f;
-	src = (speinsn >> 5) & 0x7;
-
-	vc.wp[0] = current->thread.evr[fc];
-	vc.wp[1] = regs->gpr[fc];
-	va.wp[0] = current->thread.evr[fa];
-	va.wp[1] = regs->gpr[fa];
-	vb.wp[0] = current->thread.evr[fb];
-	vb.wp[1] = regs->gpr[fb];
-
-	__FPU_FPSCR = mfspr(SPRN_SPEFSCR);
-
-	pr_debug("speinsn:%08lx spefscr:%08lx\n", speinsn, __FPU_FPSCR);
-	pr_debug("vc: %08x  %08x\n", vc.wp[0], vc.wp[1]);
-	pr_debug("va: %08x  %08x\n", va.wp[0], va.wp[1]);
-	pr_debug("vb: %08x  %08x\n", vb.wp[0], vb.wp[1]);
-
-	switch (src) {
-	case SPFP: {
-		FP_DECL_S(SA); FP_DECL_S(SB); FP_DECL_S(SR);
-
-		switch (type) {
-		case AB:
-		case XCR:
-			FP_UNPACK_SP(SA, va.wp + 1);
-		case XB:
-			FP_UNPACK_SP(SB, vb.wp + 1);
-			break;
-		case XA:
-			FP_UNPACK_SP(SA, va.wp + 1);
-			break;
-		}
-
-		pr_debug("SA: %ld %08lx %ld (%ld)\n", SA_s, SA_f, SA_e, SA_c);
-		pr_debug("SB: %ld %08lx %ld (%ld)\n", SB_s, SB_f, SB_e, SB_c);
-
-		switch (func) {
-		case EFSABS:
-			vc.wp[1] = va.wp[1] & ~SIGN_BIT_S;
-			goto update_regs;
-
-		case EFSNABS:
-			vc.wp[1] = va.wp[1] | SIGN_BIT_S;
-			goto update_regs;
-
-		case EFSNEG:
-			vc.wp[1] = va.wp[1] ^ SIGN_BIT_S;
-			goto update_regs;
-
-		case EFSADD:
-			FP_ADD_S(SR, SA, SB);
-			goto pack_s;
-
-		case EFSSUB:
-			FP_SUB_S(SR, SA, SB);
-			goto pack_s;
-
-		case EFSMUL:
-			FP_MUL_S(SR, SA, SB);
-			goto pack_s;
-
-		case EFSDIV:
-			FP_DIV_S(SR, SA, SB);
-			goto pack_s;
-
-		case EFSCMPEQ:
-			cmp = 0;
-			goto cmp_s;
-
-		case EFSCMPGT:
-			cmp = 1;
-			goto cmp_s;
-
-		case EFSCMPLT:
-			cmp = -1;
-			goto cmp_s;
-
-		case EFSCTSF:
-		case EFSCTUF:
-			if (!((vb.wp[1] >> 23) == 0xff && ((vb.wp[1] & 0x7fffff) > 0))) {
-				/* NaN */
-				if (((vb.wp[1] >> 23) & 0xff) == 0) {
-					/* denorm */
-					vc.wp[1] = 0x0;
-				} else if ((vb.wp[1] >> 31) == 0) {
-					/* positive normal */
-					vc.wp[1] = (func == EFSCTSF) ?
-						0x7fffffff : 0xffffffff;
-				} else { /* negative normal */
-					vc.wp[1] = (func == EFSCTSF) ?
-						0x80000000 : 0x0;
-				}
-			} else { /* rB is NaN */
-				vc.wp[1] = 0x0;
-			}
-			goto update_regs;
-
-		case EFSCFD: {
-			FP_DECL_D(DB);
-			FP_CLEAR_EXCEPTIONS;
-			FP_UNPACK_DP(DB, vb.dp);
-
-			pr_debug("DB: %ld %08lx %08lx %ld (%ld)\n",
-					DB_s, DB_f1, DB_f0, DB_e, DB_c);
-
-			FP_CONV(S, D, 1, 2, SR, DB);
-			goto pack_s;
-		}
-
-		case EFSCTSI:
-		case EFSCTSIZ:
-		case EFSCTUI:
-		case EFSCTUIZ:
-			if (func & 0x4) {
-				_FP_ROUND(1, SB);
-			} else {
-				_FP_ROUND_ZERO(1, SB);
-			}
-			FP_TO_INT_S(vc.wp[1], SB, 32,
-					(((func & 0x3) != 0) || SB_s));
-			goto update_regs;
-
-		default:
-			goto illegal;
-		}
-		break;
-
-pack_s:
-		pr_debug("SR: %ld %08lx %ld (%ld)\n", SR_s, SR_f, SR_e, SR_c);
-
-		FP_PACK_SP(vc.wp + 1, SR);
-		goto update_regs;
-
-cmp_s:
-		FP_CMP_S(IR, SA, SB, 3);
-		if (IR == 3 && (FP_ISSIGNAN_S(SA) || FP_ISSIGNAN_S(SB)))
-			FP_SET_EXCEPTION(FP_EX_INVALID);
-		if (IR == cmp) {
-			IR = 0x4;
-		} else {
-			IR = 0;
-		}
-		goto update_ccr;
-	}
-
-	case DPFP: {
-		FP_DECL_D(DA); FP_DECL_D(DB); FP_DECL_D(DR);
-
-		switch (type) {
-		case AB:
-		case XCR:
-			FP_UNPACK_DP(DA, va.dp);
-		case XB:
-			FP_UNPACK_DP(DB, vb.dp);
-			break;
-		case XA:
-			FP_UNPACK_DP(DA, va.dp);
-			break;
-		}
-
-		pr_debug("DA: %ld %08lx %08lx %ld (%ld)\n",
-				DA_s, DA_f1, DA_f0, DA_e, DA_c);
-		pr_debug("DB: %ld %08lx %08lx %ld (%ld)\n",
-				DB_s, DB_f1, DB_f0, DB_e, DB_c);
-
-		switch (func) {
-		case EFDABS:
-			vc.dp[0] = va.dp[0] & ~SIGN_BIT_D;
-			goto update_regs;
-
-		case EFDNABS:
-			vc.dp[0] = va.dp[0] | SIGN_BIT_D;
-			goto update_regs;
-
-		case EFDNEG:
-			vc.dp[0] = va.dp[0] ^ SIGN_BIT_D;
-			goto update_regs;
-
-		case EFDADD:
-			FP_ADD_D(DR, DA, DB);
-			goto pack_d;
-
-		case EFDSUB:
-			FP_SUB_D(DR, DA, DB);
-			goto pack_d;
-
-		case EFDMUL:
-			FP_MUL_D(DR, DA, DB);
-			goto pack_d;
-
-		case EFDDIV:
-			FP_DIV_D(DR, DA, DB);
-			goto pack_d;
-
-		case EFDCMPEQ:
-			cmp = 0;
-			goto cmp_d;
-
-		case EFDCMPGT:
-			cmp = 1;
-			goto cmp_d;
-
-		case EFDCMPLT:
-			cmp = -1;
-			goto cmp_d;
-
-		case EFDCTSF:
-		case EFDCTUF:
-			if (!((vb.wp[0] >> 20) == 0x7ff &&
-			   ((vb.wp[0] & 0xfffff) > 0 || (vb.wp[1] > 0)))) {
-				/* not a NaN */
-				if (((vb.wp[0] >> 20) & 0x7ff) == 0) {
-					/* denorm */
-					vc.wp[1] = 0x0;
-				} else if ((vb.wp[0] >> 31) == 0) {
-					/* positive normal */
-					vc.wp[1] = (func == EFDCTSF) ?
-						0x7fffffff : 0xffffffff;
-				} else { /* negative normal */
-					vc.wp[1] = (func == EFDCTSF) ?
-						0x80000000 : 0x0;
-				}
-			} else { /* NaN */
-				vc.wp[1] = 0x0;
-			}
-			goto update_regs;
-
-		case EFDCFS: {
-			FP_DECL_S(SB);
-			FP_CLEAR_EXCEPTIONS;
-			FP_UNPACK_SP(SB, vb.wp + 1);
-
-			pr_debug("SB: %ld %08lx %ld (%ld)\n",
-					SB_s, SB_f, SB_e, SB_c);
-
-			FP_CONV(D, S, 2, 1, DR, SB);
-			goto pack_d;
-		}
-
-		case EFDCTUIDZ:
-		case EFDCTSIDZ:
-			_FP_ROUND_ZERO(2, DB);
-			FP_TO_INT_D(vc.dp[0], DB, 64, ((func & 0x1) == 0));
-			goto update_regs;
-
-		case EFDCTUI:
-		case EFDCTSI:
-		case EFDCTUIZ:
-		case EFDCTSIZ:
-			if (func & 0x4) {
-				_FP_ROUND(2, DB);
-			} else {
-				_FP_ROUND_ZERO(2, DB);
-			}
-			FP_TO_INT_D(vc.wp[1], DB, 32,
-					(((func & 0x3) != 0) || DB_s));
-			goto update_regs;
-
-		default:
-			goto illegal;
-		}
-		break;
-
-pack_d:
-		pr_debug("DR: %ld %08lx %08lx %ld (%ld)\n",
-				DR_s, DR_f1, DR_f0, DR_e, DR_c);
-
-		FP_PACK_DP(vc.dp, DR);
-		goto update_regs;
-
-cmp_d:
-		FP_CMP_D(IR, DA, DB, 3);
-		if (IR == 3 && (FP_ISSIGNAN_D(DA) || FP_ISSIGNAN_D(DB)))
-			FP_SET_EXCEPTION(FP_EX_INVALID);
-		if (IR == cmp) {
-			IR = 0x4;
-		} else {
-			IR = 0;
-		}
-		goto update_ccr;
-
-	}
-
-	case VCT: {
-		FP_DECL_S(SA0); FP_DECL_S(SB0); FP_DECL_S(SR0);
-		FP_DECL_S(SA1); FP_DECL_S(SB1); FP_DECL_S(SR1);
-		int IR0, IR1;
-
-		switch (type) {
-		case AB:
-		case XCR:
-			FP_UNPACK_SP(SA0, va.wp);
-			FP_UNPACK_SP(SA1, va.wp + 1);
-		case XB:
-			FP_UNPACK_SP(SB0, vb.wp);
-			FP_UNPACK_SP(SB1, vb.wp + 1);
-			break;
-		case XA:
-			FP_UNPACK_SP(SA0, va.wp);
-			FP_UNPACK_SP(SA1, va.wp + 1);
-			break;
-		}
-
-		pr_debug("SA0: %ld %08lx %ld (%ld)\n",
-				SA0_s, SA0_f, SA0_e, SA0_c);
-		pr_debug("SA1: %ld %08lx %ld (%ld)\n",
-				SA1_s, SA1_f, SA1_e, SA1_c);
-		pr_debug("SB0: %ld %08lx %ld (%ld)\n",
-				SB0_s, SB0_f, SB0_e, SB0_c);
-		pr_debug("SB1: %ld %08lx %ld (%ld)\n",
-				SB1_s, SB1_f, SB1_e, SB1_c);
-
-		switch (func) {
-		case EVFSABS:
-			vc.wp[0] = va.wp[0] & ~SIGN_BIT_S;
-			vc.wp[1] = va.wp[1] & ~SIGN_BIT_S;
-			goto update_regs;
-
-		case EVFSNABS:
-			vc.wp[0] = va.wp[0] | SIGN_BIT_S;
-			vc.wp[1] = va.wp[1] | SIGN_BIT_S;
-			goto update_regs;
-
-		case EVFSNEG:
-			vc.wp[0] = va.wp[0] ^ SIGN_BIT_S;
-			vc.wp[1] = va.wp[1] ^ SIGN_BIT_S;
-			goto update_regs;
-
-		case EVFSADD:
-			FP_ADD_S(SR0, SA0, SB0);
-			FP_ADD_S(SR1, SA1, SB1);
-			goto pack_vs;
-
-		case EVFSSUB:
-			FP_SUB_S(SR0, SA0, SB0);
-			FP_SUB_S(SR1, SA1, SB1);
-			goto pack_vs;
-
-		case EVFSMUL:
-			FP_MUL_S(SR0, SA0, SB0);
-			FP_MUL_S(SR1, SA1, SB1);
-			goto pack_vs;
-
-		case EVFSDIV:
-			FP_DIV_S(SR0, SA0, SB0);
-			FP_DIV_S(SR1, SA1, SB1);
-			goto pack_vs;
-
-		case EVFSCMPEQ:
-			cmp = 0;
-			goto cmp_vs;
-
-		case EVFSCMPGT:
-			cmp = 1;
-			goto cmp_vs;
-
-		case EVFSCMPLT:
-			cmp = -1;
-			goto cmp_vs;
-
-		case EVFSCTSF:
-			__asm__ __volatile__ ("mtspr 512, %4\n"
-				"efsctsf %0, %2\n"
-				"efsctsf %1, %3\n"
-				: "=r" (vc.wp[0]), "=r" (vc.wp[1])
-				: "r" (vb.wp[0]), "r" (vb.wp[1]), "r" (0));
-			goto update_regs;
-
-		case EVFSCTUF:
-			__asm__ __volatile__ ("mtspr 512, %4\n"
-				"efsctuf %0, %2\n"
-				"efsctuf %1, %3\n"
-				: "=r" (vc.wp[0]), "=r" (vc.wp[1])
-				: "r" (vb.wp[0]), "r" (vb.wp[1]), "r" (0));
-			goto update_regs;
-
-		case EVFSCTUI:
-		case EVFSCTSI:
-		case EVFSCTUIZ:
-		case EVFSCTSIZ:
-			if (func & 0x4) {
-				_FP_ROUND(1, SB0);
-				_FP_ROUND(1, SB1);
-			} else {
-				_FP_ROUND_ZERO(1, SB0);
-				_FP_ROUND_ZERO(1, SB1);
-			}
-			FP_TO_INT_S(vc.wp[0], SB0, 32,
-					(((func & 0x3) != 0) || SB0_s));
-			FP_TO_INT_S(vc.wp[1], SB1, 32,
-					(((func & 0x3) != 0) || SB1_s));
-			goto update_regs;
-
-		default:
-			goto illegal;
-		}
-		break;
-
-pack_vs:
-		pr_debug("SR0: %ld %08lx %ld (%ld)\n",
-				SR0_s, SR0_f, SR0_e, SR0_c);
-		pr_debug("SR1: %ld %08lx %ld (%ld)\n",
-				SR1_s, SR1_f, SR1_e, SR1_c);
-
-		FP_PACK_SP(vc.wp, SR0);
-		FP_PACK_SP(vc.wp + 1, SR1);
-		goto update_regs;
-
-cmp_vs:
-		{
-			int ch, cl;
-
-			FP_CMP_S(IR0, SA0, SB0, 3);
-			FP_CMP_S(IR1, SA1, SB1, 3);
-			if (IR0 == 3 && (FP_ISSIGNAN_S(SA0) || FP_ISSIGNAN_S(SB0)))
-				FP_SET_EXCEPTION(FP_EX_INVALID);
-			if (IR1 == 3 && (FP_ISSIGNAN_S(SA1) || FP_ISSIGNAN_S(SB1)))
-				FP_SET_EXCEPTION(FP_EX_INVALID);
-			ch = (IR0 == cmp) ? 1 : 0;
-			cl = (IR1 == cmp) ? 1 : 0;
-			IR = (ch << 3) | (cl << 2) | ((ch | cl) << 1) |
-				((ch & cl) << 0);
-			goto update_ccr;
-		}
-	}
-	default:
-		return -EINVAL;
-	}
-
-update_ccr:
-	regs->ccr &= ~(15 << ((7 - ((speinsn >> 23) & 0x7)) << 2));
-	regs->ccr |= (IR << ((7 - ((speinsn >> 23) & 0x7)) << 2));
-
-update_regs:
-	__FPU_FPSCR &= ~FP_EX_MASK;
-	__FPU_FPSCR |= (FP_CUR_EXCEPTIONS & FP_EX_MASK);
-	mtspr(SPRN_SPEFSCR, __FPU_FPSCR);
-
-	current->thread.evr[fc] = vc.wp[0];
-	regs->gpr[fc] = vc.wp[1];
-
-	pr_debug("ccr = %08lx\n", regs->ccr);
-	pr_debug("cur exceptions = %08x spefscr = %08lx\n",
-			FP_CUR_EXCEPTIONS, __FPU_FPSCR);
-	pr_debug("vc: %08x  %08x\n", vc.wp[0], vc.wp[1]);
-	pr_debug("va: %08x  %08x\n", va.wp[0], va.wp[1]);
-	pr_debug("vb: %08x  %08x\n", vb.wp[0], vb.wp[1]);
-
-	return 0;
-
-illegal:
-	if (have_e500_cpu_a005_erratum) {
-		/* according to e500 cpu a005 erratum, reissue efp inst */
-		regs->nip -= 4;
-		pr_debug("re-issue efp inst: %08lx\n", speinsn);
-		return 0;
-	}
-
-	printk(KERN_ERR "\nOoops! IEEE-754 compliance handler encountered un-supported instruction.\ninst code: %08lx\n", speinsn);
-	return -ENOSYS;
-}
-
-int speround_handler(struct pt_regs *regs)
-{
-	union dw_union fgpr;
-	int s_lo, s_hi;
-	unsigned long speinsn, type, fc;
-
-	if (get_user(speinsn, (unsigned int __user *) regs->nip))
-		return -EFAULT;
-	if ((speinsn >> 26) != 4)
-		return -EINVAL;         /* not an spe instruction */
-
-	type = insn_type(speinsn & 0x7ff);
-	if (type == XCR) return -ENOSYS;
-
-	__FPU_FPSCR = mfspr(SPRN_SPEFSCR);
-	pr_debug("speinsn:%08lx spefscr:%08lx\n", speinsn, __FPU_FPSCR);
-
-	/* No need to round if the result is exact */
-	if (!(__FPU_FPSCR & FP_EX_INEXACT))
-		return 0;
-
-	fc = (speinsn >> 21) & 0x1f;
-	s_lo = regs->gpr[fc] & SIGN_BIT_S;
-	s_hi = current->thread.evr[fc] & SIGN_BIT_S;
-	fgpr.wp[0] = current->thread.evr[fc];
-	fgpr.wp[1] = regs->gpr[fc];
-
-	pr_debug("round fgpr: %08x  %08x\n", fgpr.wp[0], fgpr.wp[1]);
-
-	switch ((speinsn >> 5) & 0x7) {
-	/* Since SPE instructions on E500 core can handle round to nearest
-	 * and round toward zero with IEEE-754 complied, we just need
-	 * to handle round toward +Inf and round toward -Inf by software.
-	 */
-	case SPFP:
-		if ((FP_ROUNDMODE) == FP_RND_PINF) {
-			if (!s_lo) fgpr.wp[1]++; /* Z > 0, choose Z1 */
-		} else { /* round to -Inf */
-			if (s_lo) fgpr.wp[1]++; /* Z < 0, choose Z2 */
-		}
-		break;
-
-	case DPFP:
-		if (FP_ROUNDMODE == FP_RND_PINF) {
-			if (!s_hi) fgpr.dp[0]++; /* Z > 0, choose Z1 */
-		} else { /* round to -Inf */
-			if (s_hi) fgpr.dp[0]++; /* Z < 0, choose Z2 */
-		}
-		break;
-
-	case VCT:
-		if (FP_ROUNDMODE == FP_RND_PINF) {
-			if (!s_lo) fgpr.wp[1]++; /* Z_low > 0, choose Z1 */
-			if (!s_hi) fgpr.wp[0]++; /* Z_high word > 0, choose Z1 */
-		} else { /* round to -Inf */
-			if (s_lo) fgpr.wp[1]++; /* Z_low < 0, choose Z2 */
-			if (s_hi) fgpr.wp[0]++; /* Z_high < 0, choose Z2 */
-		}
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	current->thread.evr[fc] = fgpr.wp[0];
-	regs->gpr[fc] = fgpr.wp[1];
-
-	pr_debug("  to fgpr: %08x  %08x\n", fgpr.wp[0], fgpr.wp[1]);
-
-	return 0;
-}
-
-int __init spe_mathemu_init(void)
-{
-	u32 pvr, maj, min;
-
-	pvr = mfspr(SPRN_PVR);
-
-	if ((PVR_VER(pvr) == PVR_VER_E500V1) ||
-	    (PVR_VER(pvr) == PVR_VER_E500V2)) {
-		maj = PVR_MAJ(pvr);
-		min = PVR_MIN(pvr);
-
-		/*
-		 * E500 revision below 1.1, 2.3, 3.1, 4.1, 5.1
-		 * need cpu a005 errata workaround
-		 */
-		switch (maj) {
-		case 1:
-			if (min < 1)
-				have_e500_cpu_a005_erratum = 1;
-			break;
-		case 2:
-			if (min < 3)
-				have_e500_cpu_a005_erratum = 1;
-			break;
-		case 3:
-		case 4:
-		case 5:
-			if (min < 1)
-				have_e500_cpu_a005_erratum = 1;
-			break;
-		default:
-			break;
-		}
-	}
-
-	return 0;
-}
-
-module_init(spe_mathemu_init);
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/mcrfs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/mcrfs.c
deleted file mode 100644
index e948d570..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/mcrfs.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-
-int
-mcrfs(u32 *ccr, u32 crfD, u32 crfS)
-{
-	u32 value, clear;
-
-#ifdef DEBUG
-	printk("%s: %p (%08x) %d %d\n", __func__, ccr, *ccr, crfD, crfS);
-#endif
-
-	clear = 15 << ((7 - crfS) << 2);
-	if (!crfS)
-		clear = 0x90000000;
-
-	value = (__FPU_FPSCR >> ((7 - crfS) << 2)) & 15;
-	__FPU_FPSCR &= ~(clear);
-
-	*ccr &= ~(15 << ((7 - crfD) << 2));
-	*ccr |= (value << ((7 - crfD) << 2));
-
-#ifdef DEBUG
-	printk("CR: %08x\n", __func__, *ccr);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/mffs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/mffs.c
deleted file mode 100644
index 5526cf96..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/mffs.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-
-int
-mffs(u32 *frD)
-{
-	frD[1] = __FPU_FPSCR;
-
-#ifdef DEBUG
-	printk("%s: frD %p: %08x.%08x\n", __func__, frD, frD[0], frD[1]);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsb0.c b/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsb0.c
deleted file mode 100644
index bc985585..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsb0.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-
-int
-mtfsb0(int crbD)
-{
-	if ((crbD != 1) && (crbD != 2))
-		__FPU_FPSCR &= ~(1 << (31 - crbD));
-
-#ifdef DEBUG
-	printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsb1.c b/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsb1.c
deleted file mode 100644
index fe6ed5ac..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsb1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-
-int
-mtfsb1(int crbD)
-{
-	if ((crbD != 1) && (crbD != 2))
-		__FPU_FPSCR |= (1 << (31 - crbD));
-
-#ifdef DEBUG
-	printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsf.c b/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsf.c
deleted file mode 100644
index dbce92e4..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-
-int
-mtfsf(unsigned int FM, u32 *frB)
-{
-	u32 mask;
-	u32 fpscr;
-
-	if (FM == 0)
-		return 0;
-
-	if (FM == 0xff)
-		mask = 0x9fffffff;
-	else {
-		mask = 0;
-		if (FM & (1 << 0))
-			mask |= 0x90000000;
-		if (FM & (1 << 1))
-			mask |= 0x0f000000;
-		if (FM & (1 << 2))
-			mask |= 0x00f00000;
-		if (FM & (1 << 3))
-			mask |= 0x000f0000;
-		if (FM & (1 << 4))
-			mask |= 0x0000f000;
-		if (FM & (1 << 5))
-			mask |= 0x00000f00;
-		if (FM & (1 << 6))
-			mask |= 0x000000f0;
-		if (FM & (1 << 7))
-			mask |= 0x0000000f;
-	}
-
-	__FPU_FPSCR &= ~(mask);
-	__FPU_FPSCR |= (frB[1] & mask);
-
-	__FPU_FPSCR &= ~(FPSCR_VX);
-	if (__FPU_FPSCR & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
-		     FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |
-		     FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))
-		__FPU_FPSCR |= FPSCR_VX;
-
-	fpscr = __FPU_FPSCR;
-	fpscr &= ~(FPSCR_FEX);
-	if (((fpscr & FPSCR_VX) && (fpscr & FPSCR_VE)) ||
-	    ((fpscr & FPSCR_OX) && (fpscr & FPSCR_OE)) ||
-	    ((fpscr & FPSCR_UX) && (fpscr & FPSCR_UE)) ||
-	    ((fpscr & FPSCR_ZX) && (fpscr & FPSCR_ZE)) ||
-	    ((fpscr & FPSCR_XX) && (fpscr & FPSCR_XE)))
-		fpscr |= FPSCR_FEX;
-	__FPU_FPSCR = fpscr;
-
-#ifdef DEBUG
-	printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsfi.c b/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsfi.c
deleted file mode 100644
index fd2acc26..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/mtfsfi.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-
-int
-mtfsfi(unsigned int crfD, unsigned int IMM)
-{
-	u32 mask = 0xf;
-
-	if (!crfD)
-		mask = 9;
-
-	__FPU_FPSCR &= ~(mask << ((7 - crfD) << 2));
-	__FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
-
-#ifdef DEBUG
-	printk("%s: %d %x: %08lx\n", __func__, crfD, IMM, __FPU_FPSCR);
-#endif
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/stfd.c b/ANDROID_3.4.5/arch/powerpc/math-emu/stfd.c
deleted file mode 100644
index 33a165c8..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/stfd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-stfd(void *frS, void *ea)
-{
-#if 0
-#ifdef DEBUG
-	printk("%s: S %p, ea %p: ", __func__, frS, ea);
-	dump_double(frS);
-	printk("\n");
-#endif
-#endif
-
-	if (copy_to_user(ea, frS, sizeof(double)))
-		return -EFAULT;
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/stfiwx.c b/ANDROID_3.4.5/arch/powerpc/math-emu/stfiwx.c
deleted file mode 100644
index f15a35f6..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/stfiwx.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-int
-stfiwx(u32 *frS, void *ea)
-{
-#ifdef DEBUG
-	printk("%s: %p %p\n", __func__, frS, ea);
-#endif
-
-	if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
-		return -EFAULT;
-
-	return 0;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/stfs.c b/ANDROID_3.4.5/arch/powerpc/math-emu/stfs.c
deleted file mode 100644
index 61221473..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/stfs.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <asm/uaccess.h>
-
-#include <asm/sfp-machine.h>
-#include <math-emu/soft-fp.h>
-#include <math-emu/double.h>
-#include <math-emu/single.h>
-
-int
-stfs(void *frS, void *ea)
-{
-	FP_DECL_D(A);
-	FP_DECL_S(R);
-	FP_DECL_EX;
-	float f;
-
-#ifdef DEBUG
-	printk("%s: S %p, ea %p\n", __func__, frS, ea);
-#endif
-
-	FP_UNPACK_DP(A, frS);
-
-#ifdef DEBUG
-	printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
-#endif
-
-	FP_CONV(S, D, 1, 2, R, A);
-
-#ifdef DEBUG
-	printk("R: %ld %lu %ld (%ld)\n", R_s, R_f, R_e, R_c);
-#endif
-
-	_FP_PACK_CANONICAL(S, 1, R);
-	if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) {
-		_FP_PACK_RAW_1_P(S, &f, R);
-		if (copy_to_user(ea, &f, sizeof(float)))
-			return -EFAULT;
-	}
-
-	return FP_CUR_EXCEPTIONS;
-}
diff --git a/ANDROID_3.4.5/arch/powerpc/math-emu/udivmodti4.c b/ANDROID_3.4.5/arch/powerpc/math-emu/udivmodti4.c
deleted file mode 100644
index 6172044a..00000000
--- a/ANDROID_3.4.5/arch/powerpc/math-emu/udivmodti4.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* This has so very few changes over libgcc2's __udivmoddi4 it isn't funny.  */
-
-#include <math-emu/soft-fp.h>
-
-#undef count_leading_zeros
-#define count_leading_zeros  __FP_CLZ
-
-void
-_fp_udivmodti4(_FP_W_TYPE q[2], _FP_W_TYPE r[2],
-	       _FP_W_TYPE n1, _FP_W_TYPE n0,
-	       _FP_W_TYPE d1, _FP_W_TYPE d0)
-{
-  _FP_W_TYPE q0, q1, r0, r1;
-  _FP_I_TYPE b, bm;
-
-  if (d1 == 0)
-    {
-#if !UDIV_NEEDS_NORMALIZATION
-      if (d0 > n1)
-	{
-	  /* 0q = nn / 0D */
-
-	  udiv_qrnnd (q0, n0, n1, n0, d0);
-	  q1 = 0;
-
-	  /* Remainder in n0.  */
-	}
-      else
-	{
-	  /* qq = NN / 0d */
-
-	  if (d0 == 0)
-	    d0 = 1 / d0;	/* Divide intentionally by zero.  */
-
-	  udiv_qrnnd (q1, n1, 0, n1, d0);
-	  udiv_qrnnd (q0, n0, n1, n0, d0);
-
-	  /* Remainder in n0.  */
-	}
-
-      r0 = n0;
-      r1 = 0;
-
-#else /* UDIV_NEEDS_NORMALIZATION */
-
-      if (d0 > n1)
-	{
-	  /* 0q = nn / 0D */
-
-	  count_leading_zeros (bm, d0);
-
-	  if (bm != 0)
-	    {
-	      /* Normalize, i.e. make the most significant bit of the
-		 denominator set.  */
-
-	      d0 = d0 << bm;
-	      n1 = (n1 << bm) | (n0 >> (_FP_W_TYPE_SIZE - bm));
-	      n0 = n0 << bm;
-	    }
-
-	  udiv_qrnnd (q0, n0, n1, n0, d0);
-	  q1 = 0;
-
-	  /* Remainder in n0 >> bm.  */
-	}
-      else
-	{
-	  /* qq = NN / 0d */
-
-	  if (d0 == 0)
-	    d0 = 1 / d0;	/* Divide intentionally by zero.  */
-
-	  count_leading_zeros (bm, d0);
-
-	  if (bm == 0)
-	    {
-	      /* From (n1 >= d0) /\ (the most significant bit of d0 is set),
-		 conclude (the most significant bit of n1 is set) /\ (the
-		 leading quotient digit q1 = 1).
-
-		 This special case is necessary, not an optimization.
-		 (Shifts counts of SI_TYPE_SIZE are undefined.)  */
-
-	      n1 -= d0;
-	      q1 = 1;
-	    }
-	  else
-	    {
-	      _FP_W_TYPE n2;
-
-	      /* Normalize.  */
-
-	      b = _FP_W_TYPE_SIZE - bm;
-
-	      d0 = d0 << bm;
-	      n2 = n1 >> b;
-	      n1 = (n1 << bm) | (n0 >> b);
-	      n0 = n0 << bm;
-
-	      udiv_qrnnd (q1, n1, n2, n1, d0);
-	    }
-
-	  /* n1 != d0...  */
-
-	  udiv_qrnnd (q0, n0, n1, n0, d0);
-
-	  /* Remainder in n0 >> bm.  */
-	}
-
-      r0 = n0 >> bm;
-      r1 = 0;
-#endif /* UDIV_NEEDS_NORMALIZATION */
-    }
-  else
-    {
-      if (d1 > n1)
-	{
-	  /* 00 = nn / DD */
-
-	  q0 = 0;
-	  q1 = 0;
-
-	  /* Remainder in n1n0.  */
-	  r0 = n0;
-	  r1 = n1;
-	}
-      else
-	{
-	  /* 0q = NN / dd */
-
-	  count_leading_zeros (bm, d1);
-	  if (bm == 0)
-	    {
-	      /* From (n1 >= d1) /\ (the most significant bit of d1 is set),
-		 conclude (the most significant bit of n1 is set) /\ (the
-		 quotient digit q0 = 0 or 1).
-
-		 This special case is necessary, not an optimization.  */
-
-	      /* The condition on the next line takes advantage of that
-		 n1 >= d1 (true due to program flow).  */
-	      if (n1 > d1 || n0 >= d0)
-		{
-		  q0 = 1;
-		  sub_ddmmss (n1, n0, n1, n0, d1, d0);
-		}
-	      else
-		q0 = 0;
-
-	      q1 = 0;
-
-	      r0 = n0;
-	      r1 = n1;
-	    }
-	  else
-	    {
-	      _FP_W_TYPE m1, m0, n2;
-
-	      /* Normalize.  */
-
-	      b = _FP_W_TYPE_SIZE - bm;
-
-	      d1 = (d1 << bm) | (d0 >> b);
-	      d0 = d0 << bm;
-	      n2 = n1 >> b;
-	      n1 = (n1 << bm) | (n0 >> b);
-	      n0 = n0 << bm;
-
-	      udiv_qrnnd (q0, n1, n2, n1, d1);
-	      umul_ppmm (m1, m0, q0, d0);
-
-	      if (m1 > n1 || (m1 == n1 && m0 > n0))
-		{
-		  q0--;
-		  sub_ddmmss (m1, m0, m1, m0, d1, d0);
-		}
-
-	      q1 = 0;
-
-	      /* Remainder in (n1n0 - m1m0) >> bm.  */
-	      sub_ddmmss (n1, n0, n1, n0, m1, m0);
-	      r0 = (n1 << b) | (n0 >> bm);
-	      r1 = n1 >> bm;
-	    }
-	}
-    }
-
-  q[0] = q0; q[1] = q1;
-  r[0] = r0, r[1] = r1;
-}