Changeset 8ab339e in mainline for kernel/arch/arm32/include/security_ext.h

Timestamp:

2013-02-26T10:58:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b04ca9c

Parents:

1935591 (diff), 088b334 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/arm32/include/security_ext.h (modified) (1 diff)

kernel/arch/arm32/include/security_ext.h

@@ -48 +48 @@
 static inline bool sec_ext_is_implemented()
 {
-#ifdef PROCESSOR_armv7_a
+#ifdef PROCESSOR_ARCH_armv7_a
         const uint32_t idpfr = ID_PFR1_read() & ID_PFR1_SEC_EXT_MASK;
         return idpfr == ID_PFR1_SEC_EXT || idpfr == ID_PFR1_SEC_EXT_RFR;