kernel: x86_64: drop CALGARY properly