From 4e20b785564e0895150eaf04453d18b7f5fde318 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sun, 16 Nov 2008 20:07:11 -0800
Subject: [PATCH] --- yaml --- r: 123329 b: refs/heads/master c:
 5115f39c2034cb80a050d996a2a6343bce189628 h: refs/heads/master i:   123327:
 ee35405084e91aed7641e02ccf7fa6cd0444d896 v: v3

---
 [refs]                                                     | 2 +-
 .../{sparc64/math-emu/math.c => sparc/math-emu/math_64.c}  | 2 +-
 .../math-emu/sfp-util.h => sparc/math-emu/sfp-util_64.h}   | 0
 trunk/arch/sparc64/Makefile                                | 2 +-
 trunk/arch/sparc64/math-emu/Makefile                       | 7 -------
 5 files changed, 3 insertions(+), 10 deletions(-)
 rename trunk/arch/{sparc64/math-emu/math.c => sparc/math-emu/math_64.c} (99%)
 rename trunk/arch/{sparc64/math-emu/sfp-util.h => sparc/math-emu/sfp-util_64.h} (100%)
 delete mode 100644 trunk/arch/sparc64/math-emu/Makefile

diff --git a/[refs] b/[refs]
index 1585666aa51f..adbf8370ea28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 774434bf33bdc876c2818eba34e416fe1fc7a746
+refs/heads/master: 5115f39c2034cb80a050d996a2a6343bce189628
diff --git a/trunk/arch/sparc64/math-emu/math.c b/trunk/arch/sparc/math-emu/math_64.c
similarity index 99%
rename from trunk/arch/sparc64/math-emu/math.c
rename to trunk/arch/sparc/math-emu/math_64.c
index add053e0f3b3..6863c9bde25c 100644
--- a/trunk/arch/sparc64/math-emu/math.c
+++ b/trunk/arch/sparc/math-emu/math_64.c
@@ -16,7 +16,7 @@
 #include <asm/ptrace.h>
 #include <asm/uaccess.h>
 
-#include "sfp-util.h"
+#include "sfp-util_64.h"
 #include <math-emu/soft-fp.h>
 #include <math-emu/single.h>
 #include <math-emu/double.h>
diff --git a/trunk/arch/sparc64/math-emu/sfp-util.h b/trunk/arch/sparc/math-emu/sfp-util_64.h
similarity index 100%
rename from trunk/arch/sparc64/math-emu/sfp-util.h
rename to trunk/arch/sparc/math-emu/sfp-util_64.h
diff --git a/trunk/arch/sparc64/Makefile b/trunk/arch/sparc64/Makefile
index 51bc33a6ef33..e9f98ec4a69e 100644
--- a/trunk/arch/sparc64/Makefile
+++ b/trunk/arch/sparc64/Makefile
@@ -28,7 +28,7 @@ endif
 head-y := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o
 
 core-y				+= arch/sparc64/kernel/ arch/sparc64/mm/
-core-y				+= arch/sparc64/math-emu/
+core-y				+= arch/sparc/math-emu/
 libs-y				+= arch/sparc64/prom/ arch/sparc64/lib/
 drivers-$(CONFIG_OPROFILE)	+= arch/sparc64/oprofile/
 
diff --git a/trunk/arch/sparc64/math-emu/Makefile b/trunk/arch/sparc64/math-emu/Makefile
deleted file mode 100644
index cc5cb9baf6aa..000000000000
--- a/trunk/arch/sparc64/math-emu/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for the FPU instruction emulation.
-#
-
-obj-y    := math.o
-
-EXTRA_CFLAGS = -Iinclude/math-emu -w