diff --git a/procps-3.2.6-xen.dif b/procps-3.2.6-xen.dif deleted file mode 100644 index d227395..0000000 --- a/procps-3.2.6-xen.dif +++ /dev/null @@ -1,44 +0,0 @@ ---- vmstat.c -+++ vmstat.c 2009-08-19 12:37:57.000000000 +0000 -@@ -184,7 +184,7 @@ static void new_format(void) { - unsigned int intr[2], ctxt[2]; - unsigned int sleep_half; - unsigned long kb_per_page = sysconf(_SC_PAGESIZE) / 1024ul; -- int debt = 0; // handle idle ticks running backwards -+ long long debt = 0; // handle idle ticks running backwards - - sleep_half=(sleep_time/2); - new_header(); -@@ -203,6 +203,8 @@ static void new_format(void) { - dstl= *cpu_zzz; - Div= duse+dsys+didl+diow+dstl; - divo2= Div/2UL; -+ if (Div == 0) -+ Div++; - printf(format, - running, blocked, - unitConvert(kb_swap_used), unitConvert(kb_main_free), -@@ -242,16 +244,18 @@ static void new_format(void) { - - /* idle can run backwards for a moment -- kernel "feature" */ - if(debt){ -- didl = (int)didl + debt; -- debt = 0; -+ didl = (long long)didl + debt; -+ debt = 0LL; - } -- if( (int)didl < 0 ){ -- debt = (int)didl; -- didl = 0; -+ if((long long)didl < 0){ -+ debt = (long long)didl; -+ didl = 0ULL; - } - - Div= duse+dsys+didl+diow+dstl; - divo2= Div/2UL; -+ if (Div == 0) -+ continue; - printf(format, - running, blocked, - unitConvert(kb_swap_used),unitConvert(kb_main_free), diff --git a/procps.changes b/procps.changes index 7fcd38e..655e18c 100644 --- a/procps.changes +++ b/procps.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 19 14:45:52 CEST 2009 - werner@suse.de - -- Be aware that on XEN and VMware systems Div can become zero (bnc#529981) - ------------------------------------------------------------------- Thu Aug 13 11:24:10 CEST 2009 - mt@suse.de diff --git a/procps.spec b/procps.spec index d5f66e2..463c6f8 100644 --- a/procps.spec +++ b/procps.spec @@ -61,7 +61,6 @@ Patch24: procps-3.2.8-toosmall.dif Patch25: procps-3.2.7-cgroups_flag.diff Patch26: procps-3.2.8-pgrep_coption.dif Patch27: procps-3.2.7-terabyte.dif -Patch28: procps-3.2.6-xen.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -117,7 +116,6 @@ Authors: %patch25 -p1 %patch26 %patch27 -%patch28 %build make CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4