From 4b4208a25f539004359d2f405ea014f4ef443a49 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 3 Jun 2011 14:15:22 +0100
Subject: [PATCH] --- yaml --- r: 258309 b: refs/heads/master c:
 254cdf8ec39653d19cce71b6622f38a6b62ac3a8 h: refs/heads/master i:   258307:
 3cfe2ff1cd3eadb4dc41687018c175f685449bf3 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/include/asm/hwcap.h | 4 ++++
 trunk/arch/arm/kernel/setup.c      | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73aded797f16..ff6a9ba811e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 194a7f720f6f009867a01b760f311b68f1e81872
+refs/heads/master: 254cdf8ec39653d19cce71b6622f38a6b62ac3a8
diff --git a/trunk/arch/arm/include/asm/hwcap.h b/trunk/arch/arm/include/asm/hwcap.h
index 81512db2b628..c93a22a8b924 100644
--- a/trunk/arch/arm/include/asm/hwcap.h
+++ b/trunk/arch/arm/include/asm/hwcap.h
@@ -20,6 +20,10 @@
 #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)
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
 /*
diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c
index ed11fb08b05a..699df68fc840 100644
--- a/trunk/arch/arm/kernel/setup.c
+++ b/trunk/arch/arm/kernel/setup.c
@@ -977,6 +977,10 @@ static const char *hwcap_str[] = {
 	"neon",
 	"vfpv3",
 	"vfpv3d16",
+	"tls",
+	"vfpv4",
+	"idiva",
+	"idivt",
 	NULL
 };