[svn-commits] russell: trunk r317919 - in /trunk: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri May  6 16:07:49 2011
New Revision: 317919

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317919
Log:
Merged revisions 317917 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317917 | russell | 2011-05-06 16:06:33 -0500 (Fri, 06 May 2011) | 7 lines
  
  Fix calculation of free RAM to make minmemfree option work.
  
  (closes issue #17124)
  Reported by: loic
  Patches:
        pbx_c.diff uploaded by loic (license 1020)
........

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=317919&r1=317918&r2=317919
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri May  6 16:07:49 2011
@@ -5134,7 +5134,7 @@
 		if (!sysinfo(&sys_info)) {
 			/* make sure that the free system memory is above the configured low watermark
 			 * convert the amount of freeram from mem_units to MB */
-			curfreemem = sys_info.freeram / sys_info.mem_unit;
+			curfreemem = sys_info.freeram * sys_info.mem_unit;
 			curfreemem /= 1024 * 1024;
 			if (curfreemem < option_minmemfree) {
 				ast_log(LOG_WARNING, "Available system memory (~%ldMB) is below the configured low watermark (%ldMB)\n", curfreemem, option_minmemfree);