From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 03:15:27 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D91016A421; Mon,  5 Nov 2007 03:15:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9D45D16A41A
	for <perforce@freebsd.org>; Mon,  5 Nov 2007 03:15:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9392B13C4B5
	for <perforce@freebsd.org>; Mon,  5 Nov 2007 03:15:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA53FQVv043487
	for <perforce@freebsd.org>; Mon, 5 Nov 2007 03:15:26 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA53FQ4r043484
	for perforce@freebsd.org; Mon, 5 Nov 2007 03:15:26 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 5 Nov 2007 03:15:26 GMT
Message-Id: <200711050315.lA53FQ4r043484@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128665 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2007 03:15:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=128665

Change 128665 by jb@jb_freebsd1 on 2007/11/05 03:14:56

	Remove some temporary hacks.
	
	Fix 3 function prototypes definitions.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#3 (text) ====

@@ -35,17 +35,8 @@
 
 #ifndef _ASM
 #include <sys/time.h>
-#if defined(sun)
 #include <sys/cpuvar.h>
 #include <sys/cpupart.h>
-#else
-#ifdef _KERNEL
-#include <sys/pcpu.h>
-typepdef struct pcpu cpu_t;
-#else
-#define cpu_t	void
-#endif
-#endif
 #endif /* !_ASM */
 
 #define	CY_LOW_LEVEL		0
@@ -88,15 +79,15 @@
 extern cyclic_id_t cyclic_add_omni(cyc_omni_handler_t *);
 extern void cyclic_remove(cyclic_id_t);
 extern void cyclic_bind(cyclic_id_t, cpu_t *, cpupart_t *);
-extern hrtime_t cyclic_getres();
+extern hrtime_t cyclic_getres(void);
 
 extern int cyclic_offline(cpu_t *cpu);
 extern void cyclic_online(cpu_t *cpu);
 extern int cyclic_juggle(cpu_t *cpu);
 extern void cyclic_move_in(cpu_t *);
 extern int cyclic_move_out(cpu_t *);
-extern void cyclic_suspend();
-extern void cyclic_resume();
+extern void cyclic_suspend(void);
+extern void cyclic_resume(void);
 
 extern void cyclic_fire(cpu_t *cpu);
 extern void cyclic_softint(cpu_t *cpu, cyc_level_t level);