diff --git a/src/vendorcode/amd/agesa/f12/gcccar.inc b/src/vendorcode/amd/agesa/f12/gcccar.inc
index 22564cbdcc..f6b08998de 100644
--- a/src/vendorcode/amd/agesa/f12/gcccar.inc
+++ b/src/vendorcode/amd/agesa/f12/gcccar.inc
@@ -361,7 +361,7 @@ fam10_enable_stack_hook_exit:
 .macro  AMD_DISABLE_STACK_FAMILY_HOOK_F10
     LOCAL   fam10_disable_stack_hook_exit
 
-    AMD_CPUID   CPUID_MODEL
+    AMD_CPUID   $CPUID_MODEL
     shr     $20, %eax                     # AL = cpu extended family
     cmp     $0x01, %al                     # Is this family 10h?
     jnz     fam10_disable_stack_hook_exit # Br if no
diff --git a/src/vendorcode/amd/agesa/f14/gcccar.inc b/src/vendorcode/amd/agesa/f14/gcccar.inc
index 40e0e31ce7..f0a19019ce 100644
--- a/src/vendorcode/amd/agesa/f14/gcccar.inc
+++ b/src/vendorcode/amd/agesa/f14/gcccar.inc
@@ -375,7 +375,7 @@ fam10_enable_stack_hook_exit:
 .macro  AMD_DISABLE_STACK_FAMILY_HOOK_F10
     LOCAL   fam10_disable_stack_hook_exit
 
-    AMD_CPUID   CPUID_MODEL
+    AMD_CPUID   $CPUID_MODEL
     shr     $20, %eax                     # AL = cpu extended family
     cmp     $0x01, %al                     # Is this family 10h?
     jnz     fam10_disable_stack_hook_exit # Br if no
diff --git a/src/vendorcode/amd/agesa/f15tn/gcccar.inc b/src/vendorcode/amd/agesa/f15tn/gcccar.inc
index d6dd49aff0..d6c627850b 100644
--- a/src/vendorcode/amd/agesa/f15tn/gcccar.inc
+++ b/src/vendorcode/amd/agesa/f15tn/gcccar.inc
@@ -416,7 +416,7 @@ fam10_enable_stack_hook_exit:
 .macro  AMD_DISABLE_STACK_FAMILY_HOOK_F10
     LOCAL   fam10_disable_stack_hook_exit
 
-    AMD_CPUID   CPUID_MODEL
+    AMD_CPUID   $CPUID_MODEL
     shr     $20, %eax                     # AL = cpu extended family
     cmp     $0x01, %al                     # Is this family 10h?
     jnz     fam10_disable_stack_hook_exit # Br if no