smp: fix mismerge while applying nvidia patches

*stop blindly applying patches!

Change-Id: Ibf8c17bca4e1298f5e820d74a30c1be8b0770c84