26e5316524
simplifies some assumptions and stops some code compile problems. This should fix the compile hiccup in PR#3491, but smp kernel profiling isn't likely to be fixed by this.