-#define CPU_FEATURE_BEFORE_ALL BIT27\r
-#define CPU_FEATURE_AFTER_ALL BIT28\r
-#define CPU_FEATURE_BEFORE BIT29\r
-#define CPU_FEATURE_AFTER BIT30\r
+#define CPU_FEATURE_BEFORE_ALL BIT23\r
+#define CPU_FEATURE_AFTER_ALL BIT24\r
+//\r
+// CPU_FEATURE_BEFORE and CPU_FEATURE_AFTER only mean Thread scope\r
+// before and Thread scope after.\r
+// It will be replace with CPU_FEATURE_THREAD_BEFORE and\r
+// CPU_FEATURE_THREAD_AFTER, and should not be used anymore.\r
+//\r
+#define CPU_FEATURE_BEFORE BIT25\r
+#define CPU_FEATURE_AFTER BIT26\r
+\r
+#define CPU_FEATURE_THREAD_BEFORE CPU_FEATURE_BEFORE\r
+#define CPU_FEATURE_THREAD_AFTER CPU_FEATURE_AFTER\r
+#define CPU_FEATURE_CORE_BEFORE BIT27\r
+#define CPU_FEATURE_CORE_AFTER BIT28\r
+#define CPU_FEATURE_PACKAGE_BEFORE BIT29\r
+#define CPU_FEATURE_PACKAGE_AFTER BIT30\r