diff -u procps-3.2.7/debian/changelog procps-3.2.7/debian/changelog --- procps-3.2.7/debian/changelog +++ procps-3.2.7/debian/changelog @@ -1,3 +1,12 @@ +procps (1:3.2.7-11ubuntu3) jaunty; urgency=medium + + * Relaxed 100hz tick timer detection in procps. Initially this was + reported as a problem in an image running in qemu, but it has also been + found in some native imx51 and i386 systems booting on slow devices also. + (LP: #364656). + + -- David Sugar Wed, 05 Aug 2009 11:21:23 -0400 + procps (1:3.2.7-11ubuntu2) jaunty; urgency=low * debian/{preinst,postinst,postrm}: drop sysctl.d/10-process-security.conf diff -u procps-3.2.7/debian/patches/00list procps-3.2.7/debian/patches/00list --- procps-3.2.7/debian/patches/00list +++ procps-3.2.7/debian/patches/00list @@ -49,2 +49,3 @@ 55_top_highlight +60_relaxed_100hz_tick_detection 60_top_nohz only in patch2: unchanged: --- procps-3.2.7.orig/debian/patches/60_relaxed_100hz_tick_detection.dpatch +++ procps-3.2.7/debian/patches/60_relaxed_100hz_tick_detection.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_relaxed_100hz_tick_detection.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Relaxed range detection for 100hz ticks. + +@DPATCH@ +diff -urNad procps-3.2.7~/proc/sysinfo.c procps-3.2.7/proc/sysinfo.c +--- procps-3.2.7~/proc/sysinfo.c 2006-06-25 02:41:48.000000000 -0400 ++++ procps-3.2.7/proc/sysinfo.c 2009-08-05 11:50:17.262112324 -0400 +@@ -150,7 +150,7 @@ + case 48 ... 52 : Hertz = 50; break; + case 58 ... 61 : Hertz = 60; break; + case 62 ... 65 : Hertz = 64; break; /* StrongARM /Shark */ +- case 95 ... 105 : Hertz = 100; break; /* normal Linux */ ++ case 90 ... 105 : Hertz = 100; break; /* normal Linux */ + case 124 ... 132 : Hertz = 128; break; /* MIPS, ARM */ + case 195 ... 204 : Hertz = 200; break; /* normal << 1 */ + case 253 ... 260 : Hertz = 256; break;