Commit b153426d authored by David S. Miller's avatar David S. Miller

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

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
parents 797886bf 83385477
...@@ -269,11 +269,7 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len, ...@@ -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); return do_mmap2(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
} }
extern int sys_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);
int sparc_remap_file_pages(unsigned long start, unsigned long size,
unsigned long prot, unsigned long pgoff, unsigned long prot, unsigned long pgoff,
unsigned long flags) unsigned long flags)
{ {
......
...@@ -379,3 +379,5 @@ EXPORT_SYMBOL(ns87303_lock); ...@@ -379,3 +379,5 @@ EXPORT_SYMBOL(ns87303_lock);
/* for solaris compat module */ /* for solaris compat module */
EXPORT_SYMBOL_GPL(sys_call_table); EXPORT_SYMBOL_GPL(sys_call_table);
EXPORT_SYMBOL(tick_ops);
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef _ASMsparc64_TIMEX_H #ifndef _ASMsparc64_TIMEX_H
#define _ASMsparc64_TIMEX_H #define _ASMsparc64_TIMEX_H
#include <asm/timer.h>
#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
#define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ #define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */
#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \ #define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
...@@ -14,10 +16,6 @@ ...@@ -14,10 +16,6 @@
/* Getting on the cycle counter on sparc64. */ /* Getting on the cycle counter on sparc64. */
typedef unsigned long cycles_t; typedef unsigned long cycles_t;
#define get_cycles() \ #define get_cycles() tick_ops->get_tick()
({ cycles_t ret; \
__asm__ __volatile__("rd %%tick, %0" : "=r" (ret)); \
ret; \
})
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment