diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c
index e83873e3b0..16d6509430 100644
--- a/src/cpu/amd/model_fxx/model_fxx_init.c
+++ b/src/cpu/amd/model_fxx/model_fxx_init.c
@@ -13,7 +13,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
-#include <cpu/x86/msr.h>
 #include <cpu/x86/pae.h>
 #include <pc80/mc146818rtc.h>
 #include <cpu/x86/lapic.h>
@@ -455,6 +454,12 @@ void model_fxx_init(device_t dev)
 
 	k8_errata();
 	
+	/* Set SMMLOCK to avoid exploits messing with SMM */
+	msr = rdmsr(HWCR_MSR);
+	msr.lo |= (1 << 0);
+	wrmsr(HWCR_MSR, msr);
+	
+	/* Set the processor name string */
 	init_processor_name();
 	
 	enable_cache();
diff --git a/src/cpu/amd/model_fxx/model_fxx_msr.h b/src/cpu/amd/model_fxx/model_fxx_msr.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/cpu/amd/model_fxx/node_id.c b/src/cpu/amd/model_fxx/node_id.c
deleted file mode 100644
index e69de29bb2..0000000000