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

into kernel.bkbits.net:/home/davem/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);

drivers/sbus/char/aurora.c

@@ -662,11 +662,8 @@ static void aurora_check_modem(struct Aurora_board const * bp, int chip)
 		if (sbus_readb(&bp->r[chip]->r[CD180_MSVR]) & MSVR_CD) 
 			wake_up_interruptible(&port->open_wait);
 		else if (!((port->flags & ASYNC_CALLOUT_ACTIVE) &&
-			   (port->flags & ASYNC_CALLOUT_NOHUP))) {
-			MOD_INC_USE_COUNT;
-			if (schedule_task(&port->tqueue_hangup) == 0)
-				MOD_DEC_USE_COUNT;
-		}
+			   (port->flags & ASYNC_CALLOUT_NOHUP))) 
+			schedule_task(&port->tqueue_hangup);
 	}
 	
 /* We don't have such things yet. My aurora board has DTR and RTS swapped, but that doesn't count in this driver. Let's hope
@@ -1212,11 +1209,8 @@ static int aurora_setup_port(struct Aurora_board *bp, struct Aurora_port *port)
 		clear_bit(TTY_IO_ERROR, &port->tty->flags);
 		
 #ifdef MODULE
-	if (port->count == 1) {
-		MOD_INC_USE_COUNT;
-		if((++bp->count) == 1)
+	if ((port->count == 1) && ((++bp->count) == 1))
 			bp->flags |= AURORA_BOARD_ACTIVE;
-	}
 #endif
 
 	port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
@@ -1297,7 +1291,6 @@ static void aurora_shutdown_port(struct Aurora_board *bp, struct Aurora_port *po
 		bp->count = 0;
 	}
 	
-	MOD_DEC_USE_COUNT;
 	if (!bp->count)
 		bp->flags &= ~AURORA_BOARD_ACTIVE;
 #endif
@@ -2210,7 +2203,6 @@ static void do_aurora_hangup(void *private_)
 		printk("do_aurora_hangup: end\n");
 #endif
 	}
-	MOD_DEC_USE_COUNT;
 }
 
 static void aurora_hangup(struct tty_struct * tty)
@@ -2311,6 +2303,7 @@ static int aurora_init_drivers(void)
 /*	memset(IRQ_to_board, 0, sizeof(IRQ_to_board));*/
 	memset(&aurora_driver, 0, sizeof(aurora_driver));
 	aurora_driver.magic = TTY_DRIVER_MAGIC;
+	aurora_driver.owner = THIS_MODULE;
 	aurora_driver.name = "ttyA";
 	aurora_driver.major = AURORA_MAJOR;
 	aurora_driver.num = AURORA_TNPORTS;

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