131,132c131,135
< if options.fastmem and (options.caches or options.l2cache):
< fatal("You cannot use fastmem in combination with caches!")
---
> if options.fastmem:
> if TestCPUClass != AtomicSimpleCPU:
> fatal("Fastmem can only be used with atomic CPU!")
> if (options.caches or options.l2cache):
> fatal("You cannot use fastmem in combination with caches!")