diff options
author | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
commit | 230fe896faed312ef22d915e871fb5aee3ecfad0 (patch) | |
tree | 971b0c0899c72496f97970319bfadfae383abbea /mesalib/src/gallium/auxiliary/util/u_cpu_detect.c | |
parent | 180290f941da61bd80284d817e27c01cf789ee53 (diff) | |
parent | b071050b9eda9d5e5185e582dbe9f4adba863ccc (diff) | |
download | vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.gz vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.bz2 vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_cpu_detect.c')
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_cpu_detect.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c b/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c index 7e6df9df1..763b5cc22 100644 --- a/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c +++ b/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c @@ -250,6 +250,11 @@ util_cpu_detect(void) util_cpu_caps.nr_cpus = 1; #endif + /* Make the fallback cacheline size nonzero so that it can be + * safely passed to align(). + */ + util_cpu_caps.cacheline = sizeof(void *); + #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) if (has_cpuid()) { uint32_t regs[4]; |