From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:44:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B82D437B404; Fri, 4 Apr 2003 18:44:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C6EE37B401 for ; Fri, 4 Apr 2003 18:44:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1786143F75 for ; Fri, 4 Apr 2003 18:44:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h352iK0U095479 for ; Fri, 4 Apr 2003 18:44:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352iKlw095476 for perforce@freebsd.org; Fri, 4 Apr 2003 18:44:20 -0800 (PST) Date: Fri, 4 Apr 2003 18:44:20 -0800 (PST) Message-Id: <200304050244.h352iKlw095476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 28137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2003 02:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=28137 Change 28137 by peter@peter_overcee on 2003/04/04 18:44:04 s/eflags/rflags/ Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#6 (text+ko) ==== @@ -608,17 +608,17 @@ static __inline register_t intr_disable(void) { - register_t eflags; + register_t rflags; - eflags = read_eflags(); + rflags = read_rflags(); disable_intr(); - return (eflags); + return (rflags); } static __inline void -intr_restore(register_t eflags) +intr_restore(register_t rflags) { - write_eflags(eflags); + write_rflags(rflags); } #else /* !__GNUC__ */ @@ -667,9 +667,9 @@ u_int64_t rdmsr(u_int msr); u_int64_t rdpmc(u_int pmc); u_int64_t rdtsc(void); -u_int read_eflags(void); +u_int read_rflags(void); void wbinvd(void); -void write_eflags(u_int ef); +void write_rflags(u_int ef); void wrmsr(u_int msr, u_int64_t newval); u_int rdr0(void); void load_dr0(u_int dr0);