From owner-p4-projects@FreeBSD.ORG Sat Oct 27 21:46:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4ED616A4DC; Sat, 27 Oct 2007 21:46:59 +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 489C416A4C4 for ; Sat, 27 Oct 2007 21:46:59 +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 37DD013C4F5 for ; Sat, 27 Oct 2007 21:46:59 +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 l9RLkx8G067139 for ; Sat, 27 Oct 2007 21:46:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9RLkx12067136 for perforce@freebsd.org; Sat, 27 Oct 2007 21:46:59 GMT (envelope-from jb@freebsd.org) Date: Sat, 27 Oct 2007 21:46:59 GMT Message-Id: <200710272146.l9RLkx12067136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2007 21:47:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=128209 Change 128209 by jb@jb_freebsd1 on 2007/10/27 21:46:03 IFopensolaris Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#4 (text) ==== @@ -57,5 +57,6 @@ MSG_ID_ELFEDIT_EHDR 27 SUNW_OST_SGS /* ehdr: */ MSG_ID_ELFEDIT_PHDR 27 SUNW_OST_SGS /* phdr: */ MSG_ID_ELFEDIT_SHDR 27 SUNW_OST_SGS /* shdr: */ +MSG_ID_ELFEDIT_STR 27 SUNW_OST_SGS /* str: */ MSG_ID_ELFEDIT_SYM 27 SUNW_OST_SGS /* sym: */ MSG_ID_ELFEDIT_SYMINFO 27 SUNW_OST_SGS /* syminfo: */ ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 (text) ==== @@ -512,6 +512,7 @@ #define CPU_CPR_OFFLINE 0x0 #define CPU_CPR_ONLINE 0x1 #define CPU_CPR_IS_OFFLINE(cpu) (((cpu)->cpu_cpr_flags & CPU_CPR_ONLINE) == 0) +#define CPU_CPR_IS_ONLINE(cpu) ((cpu)->cpu_cpr_flags & CPU_CPR_ONLINE) #define CPU_SET_CPR_FLAGS(cpu, flag) ((cpu)->cpu_cpr_flags |= flag) #if defined(_KERNEL) || defined(_KMEMUSER)