From 0c60f6c401662eaea98101422c7d61cd9b02002f Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Thu, 23 Apr 2009 14:15:04 +0000 Subject: [PATCH] --- yaml --- r: 148551 b: refs/heads/master c: bc4d6f36db4b24bf328a5fd70038a2e609b9f028 h: refs/heads/master i: 148549: 76d38f747ad45235306fdcc90f337d46ef627abf 148547: ac7d8b5a49320e7da278277056e18e3ba2e2bc3f 148543: 7f3de34954bbce0263afcdd063e622e6f7ecddcf v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/processor.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 672ea8e647c9..5fd98cee1797 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fecbd7366bf5a39eaae2c03541f0b412f319534f +refs/heads/master: bc4d6f36db4b24bf328a5fd70038a2e609b9f028 diff --git a/trunk/arch/blackfin/include/asm/processor.h b/trunk/arch/blackfin/include/asm/processor.h index 0eece23b41c7..3040415523b2 100644 --- a/trunk/arch/blackfin/include/asm/processor.h +++ b/trunk/arch/blackfin/include/asm/processor.h @@ -131,8 +131,8 @@ unsigned long get_wchan(struct task_struct *p); /* Get the Silicon Revision of the chip */ static inline uint32_t __pure bfin_revid(void) { - /* stored in the upper 4 bits */ - uint32_t revid = bfin_read_CHIPID() >> 28; + /* Always use CHIPID, to work around ANOMALY_05000234 */ + uint32_t revid = (bfin_read_CHIPID() & CHIPID_VERSION) >> 28; #ifdef CONFIG_BF52x /* ANOMALY_05000357