Merge branch 'mainstream'

[sliver-openvswitch.git] / lib / ovs-thread.c

diff --git a/lib/ovs-thread.c b/lib/ovs-thread.c
index 1a633cf..aa3ad15 100644 (file)
--- a/lib/ovs-thread.c
+++ b/lib/ovs-thread.c
@@ -326,7 +326,7 @@ parse_cpuinfo(long int *n_cores)
 
     stream = fopen(file_name, "r");
     if (!stream) {
-        VLOG_WARN("%s: open failed (%s)", file_name, ovs_strerror(errno));
+        VLOG_DBG("%s: open failed (%s)", file_name, ovs_strerror(errno));
         return;
     }
 
@@ -371,7 +371,7 @@ parse_cpuinfo(long int *n_cores)
  * Tries not to count hyper-threads, but may be inaccurate - particularly on
  * platforms that do not provide /proc/cpuinfo, but also if /proc/cpuinfo is
  * formatted different to the layout that parse_cpuinfo() expects. */
-unsigned int
+int
 count_cpu_cores(void)
 {
     static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;