Merge commit drm-intel-fixes into topic/ppgtt

[firefly-linux-kernel-4.4.55.git] / arch / arm / include / asm / hwcap.h

diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h
index 917626128a1da7d326f6816ae63c1495a0290bc3..6ff56eca3f1f98ac5215aa0b3274f310ffbf0f7b 100644 (file)
--- a/arch/arm/include/asm/hwcap.h
+++ b/arch/arm/include/asm/hwcap.h
@@ -1,31 +1,8 @@
 #ifndef __ASMARM_HWCAP_H
 #define __ASMARM_HWCAP_H
 
-/*
- * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
- */
-#define HWCAP_SWP      (1 << 0)
-#define HWCAP_HALF     (1 << 1)
-#define HWCAP_THUMB    (1 << 2)
-#define HWCAP_26BIT    (1 << 3)        /* Play it safe */
-#define HWCAP_FAST_MULT        (1 << 4)
-#define HWCAP_FPA      (1 << 5)
-#define HWCAP_VFP      (1 << 6)
-#define HWCAP_EDSP     (1 << 7)
-#define HWCAP_JAVA     (1 << 8)
-#define HWCAP_IWMMXT   (1 << 9)
-#define HWCAP_CRUNCH   (1 << 10)
-#define HWCAP_THUMBEE  (1 << 11)
-#define HWCAP_NEON     (1 << 12)
-#define HWCAP_VFPv3    (1 << 13)
-#define HWCAP_VFPv3D16 (1 << 14)
-#define HWCAP_TLS      (1 << 15)
-#define HWCAP_VFPv4    (1 << 16)
-#define HWCAP_IDIVA    (1 << 17)
-#define HWCAP_IDIVT    (1 << 18)
-#define HWCAP_IDIV     (HWCAP_IDIVA | HWCAP_IDIVT)
+#include <uapi/asm/hwcap.h>
 
-#if defined(__KERNEL__)
 #if !defined(__ASSEMBLY__)
 /*
  * This yields a mask that user programs can use to figure out what
@@ -35,5 +12,3 @@
 extern unsigned int elf_hwcap;
 #endif
 #endif
-
-#endif