From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764227AbZD3TFN (ORCPT ); Thu, 30 Apr 2009 15:05:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1765020AbZD3TDH (ORCPT ); Thu, 30 Apr 2009 15:03:07 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:60018 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762545AbZD3TC5 (ORCPT ); Thu, 30 Apr 2009 15:02:57 -0400 Message-Id: <20090430185717.172479257@arndb.de> References: <20090430185628.866082445@arndb.de> User-Agent: quilt/0.46-1 Date: Thu, 30 Apr 2009 20:56:33 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, Michal Simek , Remis Lima Baima Subject: [PATCH v2 5/9] asm-generic: make bitops.h usable Content-Disposition: inline; filename=0005-asm-generic-make-bitops.h-usable.patch X-Provags-ID: V01U2FsdGVkX19fVThSTrHT4JwbnIw4nKXMai5EDZPRuLbdG8C 2Sd8Yr/n8VEngLHwuA6dTdWfgV+r03s152FPeflKlfuIc2/EVM Z+MO2Xfch1BXDr22Q9B8A== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org bitops.h apparently suffered from some level of bitrot, it was missing the smp_mb__{before,after}_clear_bit functions, and included other headers in an invalid order. This changes the file so that new architectures can use it out of the box. Signed-off-by: Arnd Bergmann Signed-off-by: Remis Lima Baima --- include/asm-generic/bitops.h | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h index c9f369c..a54f442 100644 --- a/include/asm-generic/bitops.h +++ b/include/asm-generic/bitops.h @@ -1,19 +1,29 @@ -#ifndef _ASM_GENERIC_BITOPS_H_ -#define _ASM_GENERIC_BITOPS_H_ +#ifndef __ASM_GENERIC_BITOPS_H +#define __ASM_GENERIC_BITOPS_H /* * For the benefit of those who are trying to port Linux to another * architecture, here are some C-language equivalents. You should * recode these in the native assembly language, if at all possible. - * + * * C language equivalents written by Theodore Ts'o, 9/26/92 */ -#include -#include +#include +#include + +/* + * clear_bit may not imply a memory barrier + */ +#ifndef smp_mb__before_clear_bit +#define smp_mb__before_clear_bit() smp_mb() +#define smp_mb__after_clear_bit() smp_mb() +#endif + #include #include #include +#include #include #include @@ -26,8 +36,10 @@ #include #include +#include +#include #include #include #include -#endif /* _ASM_GENERIC_BITOPS_H */ +#endif /* __ASM_GENERIC_BITOPS_H */ -- 1.5.6.3 --