summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2012-02-08 20:31:42 +0000
committerjkim <jkim@FreeBSD.org>2012-02-08 20:31:42 +0000
commit234d88c28880ea3d9014955d1d8c6d90d043c878 (patch)
treeabb6b7995319484efdf7ea41ba66f289b0c56d77 /etc
parent2622c5d01eccafbd6a0c3dfd4a4ab839f612244a (diff)
downloadFreeBSD-src-234d88c28880ea3d9014955d1d8c6d90d043c878.zip
FreeBSD-src-234d88c28880ea3d9014955d1d8c6d90d043c878.tar.gz
Revert r211288 and move the logic to the acpi_timer itself.
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc.resume6
-rwxr-xr-xetc/rc.suspend12
2 files changed, 0 insertions, 18 deletions
diff --git a/etc/rc.resume b/etc/rc.resume
index 3b2e970..b68f981 100755
--- a/etc/rc.resume
+++ b/etc/rc.resume
@@ -43,12 +43,6 @@ if [ -r /var/run/rc.suspend.pid ]; then
echo 'rc.resume: killed rc.suspend that was still around'
fi
-if [ -r /var/run/rc.suspend.tch ]; then
- _t=`cat /var/run/rc.suspend.tch`
- /sbin/sysctl -n kern.timecounter.hardware=$_t > /dev/null 2>&1
- /bin/rm -f /var/run/rc.suspend.tch
-fi
-
if [ -r /var/run/moused.pid ]; then
pkill -HUP -F /var/run/moused.pid
fi
diff --git a/etc/rc.suspend b/etc/rc.suspend
index 90c085b..5f22cd1 100755
--- a/etc/rc.suspend
+++ b/etc/rc.suspend
@@ -43,18 +43,6 @@ fi
echo $$ 2> /dev/null > /var/run/rc.suspend.pid
-_t=`/sbin/sysctl -n kern.timecounter.hardware 2> /dev/null`
-case ${_t#ACPI-} in
-fast|safe)
- /bin/rm -f /var/run/rc.suspend.tch
- ;;
-*)
- { /sbin/sysctl -n kern.timecounter.hardware=ACPI-fast || \
- /sbin/sysctl -n kern.timecounter.hardware=ACPI-safe; } \
- > /dev/null 2>&1 && echo $_t > /var/run/rc.suspend.tch
- ;;
-esac
-
# If you have troubles on suspending with PC-CARD modem, try this.
# See also contrib/pccardq.c (Only for PAO users).
# pccardq | awk -F '~' '$5 == "filled" && $4 ~ /uart/ \
OpenPOWER on IntegriCloud