Merge branch 'printk-rework' into for-linus

[linux-2.6-microblaze.git] / include / linux / arm-smccc.h

diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index 8254e11..15c706f 100644 (file)
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -86,6 +86,28 @@
                           ARM_SMCCC_SMC_32,                            \
                           0, 0x7fff)
 
+/* Paravirtualised time calls (defined by ARM DEN0057A) */
+#define ARM_SMCCC_HV_PV_TIME_FEATURES                          \
+       ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,                 \
+                          ARM_SMCCC_SMC_64,                    \
+                          ARM_SMCCC_OWNER_STANDARD_HYP,        \
+                          0x20)
+
+#define ARM_SMCCC_HV_PV_TIME_ST                                        \
+       ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,                 \
+                          ARM_SMCCC_SMC_64,                    \
+                          ARM_SMCCC_OWNER_STANDARD_HYP,        \
+                          0x21)
+
+/*
+ * Return codes defined in ARM DEN 0070A
+ * ARM DEN 0070A is now merged/consolidated into ARM DEN 0028 C
+ */
+#define SMCCC_RET_SUCCESS                      0
+#define SMCCC_RET_NOT_SUPPORTED                        -1
+#define SMCCC_RET_NOT_REQUIRED                 -2
+#define SMCCC_RET_INVALID_PARAMETER            -3
+
 #ifndef __ASSEMBLY__
 
 #include <linux/linkage.h>
@@ -336,15 +358,6 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
  */
 #define arm_smccc_1_1_hvc(...) __arm_smccc_1_1(SMCCC_HVC_INST, __VA_ARGS__)
 
-/*
- * Return codes defined in ARM DEN 0070A
- * ARM DEN 0070A is now merged/consolidated into ARM DEN 0028 C
- */
-#define SMCCC_RET_SUCCESS                      0
-#define SMCCC_RET_NOT_SUPPORTED                        -1
-#define SMCCC_RET_NOT_REQUIRED                 -2
-#define SMCCC_RET_INVALID_PARAMETER            -3
-
 /*
  * Like arm_smccc_1_1* but always returns SMCCC_RET_NOT_SUPPORTED.
  * Used when the SMCCC conduit is not defined. The empty asm statement
@@ -390,18 +403,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
                method;                                                 \
        })
 
-/* Paravirtualised time calls (defined by ARM DEN0057A) */
-#define ARM_SMCCC_HV_PV_TIME_FEATURES                          \
-       ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,                 \
-                          ARM_SMCCC_SMC_64,                    \
-                          ARM_SMCCC_OWNER_STANDARD_HYP,        \
-                          0x20)
-
-#define ARM_SMCCC_HV_PV_TIME_ST                                        \
-       ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,                 \
-                          ARM_SMCCC_SMC_64,                    \
-                          ARM_SMCCC_OWNER_STANDARD_HYP,        \
-                          0x21)
-
 #endif /*__ASSEMBLY__*/
 #endif /*__LINUX_ARM_SMCCC_H*/