This commit was manufactured by cvs2svn to create tag 'RELEASE_6_4_0'.release/6.4.0

1 files changed, 0 insertions, 53 deletions

diff --git a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c
deleted file mode 100644
index 1f996ad6edf2..000000000000
--- a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig	2006-03-07 01:23:52.000000000 +0900
-+++ agent/mibgroup/hardware/memory/memory_freebsd.c	2008-08-24 23:35:12.857234897 +0900
-@@ -47,6 +47,9 @@
-     int            phys_mem_mib[] = { CTL_HW, HW_PHYSMEM };
-     int            user_mem_mib[] = { CTL_HW, HW_USERMEM };
- 
-+    long            bufspace;
-+
-+
-     /*
-      * Retrieve the memory information from the underlying O/S...
-      */
-@@ -54,6 +57,7 @@
-     sysctl(phys_mem_mib, 2, &phys_mem, &mem_size,      NULL, 0);
-     sysctl(user_mem_mib, 2, &user_mem, &mem_size,      NULL, 0);
-     auto_nlist(SUM_SYMBOL,      (char *) &vmem,     sizeof(vmem));
-+    auto_nlist(BUFSPACE_SYMBOL, (char *) &bufspace, sizeof(bufspace));
- #ifndef freebsd4
-     pagesize = 1024;
- #else
-@@ -70,7 +74,7 @@
-         if (!mem->descr)
-              mem->descr = strdup("Physical memory");
-         mem->units = pagesize;
--        mem->size  = user_mem/pagesize;
-+        mem->size  = phys_mem/pagesize;
-         mem->free  = total.t_free;
-     }
- 
-@@ -125,10 +129,22 @@
-         if (!mem->descr)
-              mem->descr = strdup("Cached memory");
-         mem->units = vmem.v_page_size;
--        mem->size  = vmem.v_cache_count;
-+        mem->size  = vmem.v_cache_count + vmem.v_inactive_count;
-+        mem->free  = -1;
-+    }
-+
-+    mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 );
-+    if (!mem) {
-+        snmp_log_perror("No Memory Buffer info entry");
-+    } else {
-+        if (!mem->descr)
-+             mem->descr = strdup("Memory Buffer");
-+        mem->units = pagesize;
-+        mem->size  = bufspace/pagesize;
-         mem->free  = -1;
-     }
- 
-+
-     nswap = swapmode(pagesize);
-     mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 );
-     if (!mem) {