From 7abb38a2d994d4b9f41c632ea0c2b7aded48717a Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Fri, 25 Jun 2010 16:46:08 -0700
Subject: [PATCH] --- yaml --- r: 204538 b: refs/heads/master c:
 1d1929c7662d5da3badcf0df2ca5c9b2dc15db97 h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 .../asm/mach-cavium-octeon/cpu-feature-overrides.h        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ae63f1c1132a..bd4bb17ccb28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a403d1d2e549bc7d280001503867321572717f6
+refs/heads/master: 1d1929c7662d5da3badcf0df2ca5c9b2dc15db97
diff --git a/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
index bbf054042395..2a7ea90fee2a 100644
--- a/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
+++ b/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -77,6 +77,14 @@ static inline int read_current_timer(unsigned long *result)
 	return 0;
 }
 
+#ifdef __OCTEON__
+/*
+ * All gcc versions that have OCTEON support define __OCTEON__ and have the
+ *  __builtin_popcount support.
+ */
+#define ARCH_HAS_USABLE_BUILTIN_POPCOUNT 1
+#endif
+
 static inline int octeon_has_saa(void)
 {
 	int id;