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

Timestamp:

2015-06-17T23:45:24Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

523b17a

Parents:

fc7bf19 (diff), 2654afb (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:

Sync with mainline

File:

• kernel/arch/arm32/include/arch/security_ext.h (modified) (3 diffs)

kernel/arch/arm32/include/arch/security_ext.h

@@ -46 +46 @@
  * older archs.
  */
-static inline bool sec_ext_is_implemented()
+static inline bool sec_ext_is_implemented(void)
 {
 #ifdef PROCESSOR_ARCH_armv7_a
@@ -60 +60 @@
  * mode.
  */
-static inline bool sec_ext_is_monitor_mode()
+static inline bool sec_ext_is_monitor_mode(void)
 {
         return (current_status_reg_read() & MODE_MASK) == MONITOR_MODE;
@@ -75 +75 @@
  * Look for 'secureworld_exit' in arch/arm/cpu/armv7/omap3/board.c.
  */
-static inline bool sec_ext_is_secure()
+static inline bool sec_ext_is_secure(void)
 {
         return sec_ext_is_implemented()