Index: intern/cycles/util/util_system.cpp
===================================================================
--- intern/cycles/util/util_system.cpp	(revision 36375)
+++ intern/cycles/util/util_system.cpp	(working copy)
@@ -60,7 +60,10 @@
 #ifndef _WIN32
 static void __cpuid(int data[4], int selector)
 {
-	asm("cpuid" : "=a" (data[0]), "=b" (data[1]), "=c" (data[2]), "=d" (data[3]) : "a"(selector));
+	asm("pushl %%ebx    \n\t"
+        "cpuid          \n\t"
+        "movl %%ebx, %1 \n\t"
+        "popl %%ebx     \n\t" : "=a" (data[0]), "=r" (data[1]), "=c" (data[2]), "=d" (data[3]) : "a"(selector));
 }
 #endif
 
Index: intern/cycles/util/util_view.cpp
===================================================================
--- intern/cycles/util/util_view.cpp	(revision 36375)
+++ intern/cycles/util/util_view.cpp	(working copy)
@@ -167,7 +167,7 @@
 	glutCreateWindow(title);
 
 #ifndef __APPLE__
-	glewInit();
+	//glewInit();
 #endif
 
 	view_reshape(width, height);