smm: remove useless code from the conflicts of commits
smm: remove useless code from the conflicts of commits

cmlasu/smm_gem5,cmlasu/smm_gem5,cmlasu/smm_gem5,cmlasu/smm_gem5,cmlasu/smm_gem5,cmlasu/smm_gem5,cmlasu/smm_gem5