Date: Sat, 21 Sep 2002 12:03:15 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17870 for review Message-ID: <200209211903.g8LJ3FJh034761@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17870 Change 17870 by peter@peter_overcee on 2002/09/21 12:00:06 integrate via i386_hammer branch Affected files ... .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/x86_64/isa/clock.c#4 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.128 2002/07/21 05:22:16 peter Exp $ + * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.129 2002/09/21 18:26:53 markm Exp $ */ /* @@ -124,6 +124,12 @@ return (mask == 0 ? mask : (int)bsrl((u_int)mask) + 1); } +static __inline void +halt(void) +{ + __asm __volatile("hlt"); +} + #if __GNUC__ < 2 #define inb(port) inbv(port) @@ -600,6 +606,7 @@ void disable_intr(void); void do_cpuid(u_int ax, u_int *p); void enable_intr(void); +void halt(void); u_char inb(u_int port); u_int inl(u_int port); void insb(u_int port, void *addr, size_t cnt); ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/clock.c,v 1.188 2002/09/18 07:34:04 iwasaki Exp $ + * $FreeBSD: src/sys/i386/isa/clock.c,v 1.189 2002/09/21 07:59:06 phk Exp $ */ /* @@ -65,8 +65,6 @@ #include <sys/power.h> #include <machine/clock.h> -#ifdef CLK_CALIBRATION_LOOP -#endif #include <machine/cputypes.h> #include <machine/frame.h> #include <machine/limits.h> To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209211903.g8LJ3FJh034761>