Commit f2e9517a authored by Erik von Reis's avatar Erik von Reis
Browse files

Merge branch 'master' into debian/bullseye

parents 7feba656 b25bc3cb
......@@ -7,6 +7,6 @@
// Set to 1 for release version, 0 for development version
// When 0, causes version number to be displayed as negative on MEDM screens
#define RCG_VERSION_REL 0
#define RCG_VERSION_REL 1
#endif //LIGO_RCG_VERSION_H
......@@ -5,6 +5,7 @@
#if defined(__KERNEL__)
#include <asm/cpufeature.h>
#include <asm/msr.h> //rdtsc_ordered()
#include <asm/tsc.h> //tsc_khz
......
......@@ -263,8 +263,8 @@ inline int copyIpcData (int start_indx, int end_indx, int netFrom, int netTo)
}
// If anything was copied, we need to flush the buffer
//if (ttcache > 0) clflush_cache_range (&(g_dolphin_write_addrs[netTo]->dBlock[cblock][dblock].data), 16);
if(!ttcache) udelay(1);
if (ttcache > 0) clflush_cache_range (&(g_dolphin_write_addrs[netTo]->dBlock[cblock][dblock].data), 16);
//if(!ttcache) udelay(1);
// return total xfers, which is used as code running diagnostic
return xfers;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment