Only one use of the DO_TRAP macros remains. Expand that one and
remove the macros now.
Signed-off-by: NAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: NIngo Molnar <mingo@elte.hu>