Waldemar Brodkorb e1e46622ac Revert "resolve merge" 9 lat temu
..
pt-machine.h e1e46622ac Revert "resolve merge" 9 lat temu
tcb-offsets.h e1e46622ac Revert "resolve merge" 9 lat temu