From owner-svn-src-stable@FreeBSD.ORG Sun Sep 13 10:04:08 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8A7F1065695; Sun, 13 Sep 2009 10:04:08 +0000 (UTC) (envelope-from nork@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C6EB48FC13; Sun, 13 Sep 2009 10:04:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DA48pO013162; Sun, 13 Sep 2009 10:04:08 GMT (envelope-from nork@svn.freebsd.org) Received: (from nork@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8DA48wf013160; Sun, 13 Sep 2009 10:04:08 GMT (envelope-from nork@svn.freebsd.org) Message-Id: <200909131004.n8DA48wf013160@svn.freebsd.org> From: Norikatsu Shigemura Date: Sun, 13 Sep 2009 10:04:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197149 - stable/8/sys/dev/coretemp X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2009 10:04:09 -0000 Author: nork Date: Sun Sep 13 10:04:08 2009 New Revision: 197149 URL: http://svn.freebsd.org/changeset/base/197149 Log: MFC r196889: Change 'dev.cpu.N.temperature', sysctl I (degC) to IK (Kelvin), to match acpi_thermal(4) and amdtemp(4). Approved by: re (rwatson) Reviewed by: rpaulo Suggested by: ume Modified: stable/8/sys/dev/coretemp/coretemp.c (contents, props changed) Modified: stable/8/sys/dev/coretemp/coretemp.c ============================================================================== --- stable/8/sys/dev/coretemp/coretemp.c Sun Sep 13 01:00:24 2009 (r197148) +++ stable/8/sys/dev/coretemp/coretemp.c Sun Sep 13 10:04:08 2009 (r197149) @@ -48,6 +48,8 @@ __FBSDID("$FreeBSD$"); #include #include +#define TZ_ZEROC 2732 + struct coretemp_softc { device_t sc_dev; int sc_tjmax; @@ -193,8 +195,8 @@ coretemp_attach(device_t dev) SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, - dev, 0, coretemp_get_temp_sysctl, "I", - "Current temperature in degC"); + dev, 0, coretemp_get_temp_sysctl, "IK", + "Current temperature"); return (0); } @@ -283,7 +285,7 @@ coretemp_get_temp_sysctl(SYSCTL_HANDLER_ device_t dev = (device_t) arg1; int temp; - temp = coretemp_get_temp(dev); + temp = coretemp_get_temp(dev) * 10 + TZ_ZEROC; return (sysctl_handle_int(oidp, &temp, 0, req)); }