From 44882e2ff73e81c2ee76a052dd281733756a336c Mon Sep 17 00:00:00 2001
From: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
Date: Thu, 29 May 2008 17:57:09 +0300
Subject: [PATCH] --- yaml --- r: 101423 b: refs/heads/master c:
 17f61e61b4a1d3ca254668cf12c1c5d828d892fd h: refs/heads/master i:   101421:
 abd14fe8ba61ef4898f529da7596a3002116dd2f   101419:
 7e14e8694d4e4c78d465b64b7b08dfebbd63f6af   101415:
 08cca811886ee3a5b64edd2ddd3f63f42894bd6f   101407:
 128fc1ca0178966a408d5a0c2513ecb553d124e4 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/mips/mm/uasm.c | 4 ++--
 trunk/arch/mips/mm/uasm.h | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e6046dd12bc6..a4b012758a99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07cdb78436d52416a582e645b9afb6e26f986bc9
+refs/heads/master: 17f61e61b4a1d3ca254668cf12c1c5d828d892fd
diff --git a/trunk/arch/mips/mm/uasm.c b/trunk/arch/mips/mm/uasm.c
index 1655aa69e133..f467199676a8 100644
--- a/trunk/arch/mips/mm/uasm.c
+++ b/trunk/arch/mips/mm/uasm.c
@@ -396,7 +396,7 @@ int __cpuinit uasm_in_compat_space_p(long addr)
 #endif
 }
 
-int __cpuinit uasm_rel_highest(long val)
+static int __cpuinit uasm_rel_highest(long val)
 {
 #ifdef CONFIG_64BIT
 	return ((((val + 0x800080008000L) >> 48) & 0xffff) ^ 0x8000) - 0x8000;
@@ -405,7 +405,7 @@ int __cpuinit uasm_rel_highest(long val)
 #endif
 }
 
-int __cpuinit uasm_rel_higher(long val)
+static int __cpuinit uasm_rel_higher(long val)
 {
 #ifdef CONFIG_64BIT
 	return ((((val + 0x80008000L) >> 32) & 0xffff) ^ 0x8000) - 0x8000;
diff --git a/trunk/arch/mips/mm/uasm.h b/trunk/arch/mips/mm/uasm.h
index 0d6a66f32030..c6d1e3dd82d4 100644
--- a/trunk/arch/mips/mm/uasm.h
+++ b/trunk/arch/mips/mm/uasm.h
@@ -103,8 +103,6 @@ struct uasm_label {
 void __cpuinit uasm_build_label(struct uasm_label **lab, u32 *addr, int lid);
 #ifdef CONFIG_64BIT
 int uasm_in_compat_space_p(long addr);
-int uasm_rel_highest(long val);
-int uasm_rel_higher(long val);
 #endif
 int uasm_rel_hi(long val);
 int uasm_rel_lo(long val);