oprofile/oprofile-0.9.7-watchdog.diff
Dirk Mueller bad9cdfb52 Accepting request 98319 from home:klaussfreire:branches:devel:tools
Bug #684751, opcontrol --start fails because of NMI watchdog. The real issue, is the watchdog /proc interface was moved from /proc/blah/nmi_watchdog to /proc/blah/watchdog, a simple search and replace fixed it.

I'm actually testing it on my local without issues.

I couldn't find anything useful in the openSUSE bug (684751), but I did find a debian bug filled with interesting details (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615964).

You will probably have to add the necessary tags to the patches, I couldn't find any examples in any of the existing patches but I did see the warning.

Changes from sr#98110:
 - Added changelog entry

OBS-URL: https://build.opensuse.org/request/show/98319
OBS-URL: https://build.opensuse.org/package/show/devel:tools/oprofile?expand=0&rev=23
2012-01-03 15:21:55 +00:00

18 lines
677 B
Diff

diff -wur oprofile-0.9.7/utils/opcontrol oprofile-0.9.7-nu/utils/opcontrol
--- oprofile-0.9.7/utils/opcontrol 2011-07-20 16:36:48.000000000 -0300
+++ oprofile-0.9.7-nu/utils/opcontrol 2011-12-24 11:36:16.141000284 -0300
@@ -1211,10 +1211,10 @@
echo $3 >$MOUNT/$1/$2
else
echo -n "Error: counter $1 not available"
- if test -e /proc/sys/kernel/nmi_watchdog; then
- echo " nmi_watchdog using this resource ? Try:"
+ if test -e /proc/sys/kernel/watchdog; then
+ echo " watchdog using this resource ? Try:"
echo "opcontrol --deinit"
- echo "echo 0 > /proc/sys/kernel/nmi_watchdog"
+ echo "echo 0 > /proc/sys/kernel/watchdog"
fi
exit 1
fi