s390: cleanup bitops.h.
PATCH 1/24 s390: cleanup bitops.h.
From: Heiko Carstens <[email protected]>
[S390] cleanup bitops.h.
Encapsulate complete bitops.h with #ifdef __KERNEL__ and remove the now superfluous ALIGN_CS define and its users.
This patch is needed for compiling klibc.
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
include/asm-s390/bitops.h | 42 +++--------------------------------------- 1 files changed, 3 insertions(+), 39 deletions(-)
include/asm-s390/bitops.h +3 -39
@@ -12,6 +12,9 @@* Copyright (C) 1992, Linus Torvalds * */ + +#ifdef __KERNEL__ +#include <linux/config.h> #include <linux/compiler.h>
@@ -51,19 +54,6 @@* with operation of the form "set_bit(bitnr, flags)". */ -/* set ALIGN_CS to 1 if the SMP safe bit operations should -* align the address to 4 byte boundary. It seems to work -* without the alignment. -*/ -#ifdef __KERNEL__ -#define ALIGN_CS 0 -#else -#define ALIGN_CS 1 -#ifndef CONFIG_SMP -#error "bitops won't work without CONFIG_SMP" -#endif -#endif -/* bitmap tables from arch/S390/kernel/bitmap.S */ extern const char _oi_bitmap[];extern const char _ni_bitmap[];
@@ -122,10 +112,6 @@ static inline void set_bit_cs(unsigned lunsigned long addr, old, new, mask; addr = (unsigned long ) ptr; -#if ALIGN_CS ==1 - nr += (addr & __BITOPS_ALIGN) <<3 ;/* add alignment to bit number */ - addr ^= addr & __BITOPS_ALIGN;/* align address to 8 */ -#endif /* calculate address for CS */ addr += (nr ^ (nr & (__BITOPS_WORDSIZE -1 ))) >>3 ;/* make OR mask */
@@ -142,10 +128,6 @@ static inline void clear_bit_cs(unsignedunsigned long addr, old, new, mask; addr = (unsigned long ) ptr; -#if ALIGN_CS ==1 - nr += (addr & __BITOPS_ALIGN) <<3 ;/* add alignment to bit number */ - addr ^= addr & __BITOPS_ALIGN;/* align address to 8 */ -#endif /* calculate address for CS */ addr += (nr ^ (nr & (__BITOPS_WORDSIZE -1 ))) >>3 ;/* make AND mask */
@@ -162,10 +144,6 @@ static inline void change_bit_cs(unsigneunsigned long addr, old, new, mask; addr = (unsigned long ) ptr; -#if ALIGN_CS ==1 - nr += (addr & __BITOPS_ALIGN) <<3 ;/* add alignment to bit number */ - addr ^= addr & __BITOPS_ALIGN;/* align address to 8 */ -#endif /* calculate address for CS */ addr += (nr ^ (nr & (__BITOPS_WORDSIZE -1 ))) >>3 ;/* make XOR mask */
@@ -183,10 +161,6 @@ test_and_set_bit_cs(unsigned long nr, vounsigned long addr, old, new, mask; addr = (unsigned long ) ptr; -#if ALIGN_CS ==1 - nr += (addr & __BITOPS_ALIGN) <<3 ;/* add alignment to bit number */ - addr ^= addr & __BITOPS_ALIGN;/* align address to 8 */ -#endif /* calculate address for CS */ addr += (nr ^ (nr & (__BITOPS_WORDSIZE -1 ))) >>3 ;/* make OR/test mask */
@@ -206,10 +180,6 @@ test_and_clear_bit_cs(unsigned long nr,unsigned long addr, old, new, mask; addr = (unsigned long ) ptr; -#if ALIGN_CS ==1 - nr += (addr & __BITOPS_ALIGN) <<3 ;/* add alignment to bit number */ - addr ^= addr & __BITOPS_ALIGN;/* align address to 8 */ -#endif /* calculate address for CS */ addr += (nr ^ (nr & (__BITOPS_WORDSIZE -1 ))) >>3 ;/* make AND/test mask */
@@ -229,10 +199,6 @@ test_and_change_bit_cs(unsigned long nr,unsigned long addr, old, new, mask; addr = (unsigned long ) ptr; -#if ALIGN_CS ==1 - nr += (addr & __BITOPS_ALIGN) <<3 ;/* add alignment to bit number */ - addr ^= addr & __BITOPS_ALIGN;/* align address to 8 */ -#endif /* calculate address for CS */ addr += (nr ^ (nr & (__BITOPS_WORDSIZE -1 ))) >>3 ;/* make XOR/test mask */
@@ -835,8 +801,6 @@ static inline int sched_find_first_bit(u#include <asm-generic/bitops/hweight.h> -#ifdef __KERNEL__ -/* * ATTENTION: intel byte ordering convention for ext2 and minix !! * bit 0 is the LSB of addr; bit 31 is the MSB of addr;