Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

arch/sparc/kernel/sys_sparc.c

@@ -269,11 +269,7 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
 	return do_mmap2(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
 }
 
-extern int sys_remap_file_pages(unsigned long start, unsigned long size,
-				unsigned long prot, unsigned long pgoff,
-				unsigned long flags);
-
-int sparc_remap_file_pages(unsigned long start, unsigned long size,
+long sparc_remap_file_pages(unsigned long start, unsigned long size,
 			   unsigned long prot, unsigned long pgoff,
 			   unsigned long flags)
 {

arch/sparc64/kernel/sparc64_ksyms.c

@@ -379,3 +379,5 @@ EXPORT_SYMBOL(ns87303_lock);
 
 /* for solaris compat module */
 EXPORT_SYMBOL_GPL(sys_call_table);
+
+EXPORT_SYMBOL(tick_ops);

include/asm-sparc64/timex.h

@@ -6,6 +6,8 @@
 #ifndef _ASMsparc64_TIMEX_H
 #define _ASMsparc64_TIMEX_H
 
+#include <asm/timer.h>
+
 #define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
 #define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */
 #define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
@@ -14,10 +16,6 @@
 
 /* Getting on the cycle counter on sparc64. */
 typedef unsigned long cycles_t;
-#define get_cycles() \
-({	cycles_t ret; \
-	__asm__ __volatile__("rd	%%tick, %0" : "=r" (ret)); \
-	ret; \
-})
+#define get_cycles()	tick_ops->get_tick()
 
 #endif