I'm a little concerned here. This sounds like forced unification.
If we can't clean up the infrastructure so things are obviously better
and cleanly factored for both architectures we should not unify the files.
As a general principle I would rather have two crudy files side by
side the one super crudy file.
So for unification I suggest finally fixing this right and taking the
apics completely out of the kexec on panic path.
Eric
-