kernel/hammer: Remove unused variables and add __debugvar.
kernel: Replace the remaining __amd64__ with __x86_64__ for consistency.
Merge branch 'mas1' into badhptt