From 67ecffc0f530a7b5c4dd5111ea7dd3213da8eb91 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 28 Sep 2015 11:50:51 -0400 Subject: [PATCH] Cleanup: remove trailing whitespaces at EOL Signed-off-by: Mathieu Desnoyers --- compat_futex.c | 4 ++-- rculfhash.c | 30 +++++++++++++++--------------- urcu-bp.h | 2 +- urcu-call-rcu.h | 2 +- urcu-defer.h | 4 ++-- urcu-pointer.h | 4 ++-- urcu-qsbr.h | 4 ++-- urcu.h | 4 ++-- urcu/arch/arm.h | 4 ++-- urcu/arch/gcc.h | 4 ++-- urcu/arch/generic.h | 2 +- urcu/arch/ppc.h | 4 ++-- urcu/arch/s390.h | 4 ++-- urcu/arch/sparc64.h | 4 ++-- urcu/arch/x86.h | 4 ++-- urcu/futex.h | 4 ++-- urcu/static/urcu-bp.h | 2 +- urcu/static/urcu-pointer.h | 4 ++-- urcu/static/urcu-qsbr.h | 4 ++-- urcu/static/urcu.h | 2 +- urcu/uatomic/arm.h | 6 +++--- urcu/uatomic/gcc.h | 6 +++--- urcu/uatomic/ppc.h | 6 +++--- urcu/uatomic/s390.h | 4 ++-- urcu/uatomic/sparc64.h | 6 +++--- urcu/uatomic/unknown.h | 2 +- urcu/uatomic/x86.h | 6 +++--- 27 files changed, 66 insertions(+), 66 deletions(-) diff --git a/compat_futex.c b/compat_futex.c index 6fe378f..b7f78f0 100644 --- a/compat_futex.c +++ b/compat_futex.c @@ -58,7 +58,7 @@ int compat_futex_noasync(int32_t *uaddr, int op, int32_t val, /* * Check if NULL. Don't let users expect that they are taken into - * account. + * account. */ assert(!timeout); assert(!uaddr2); @@ -120,7 +120,7 @@ int compat_futex_async(int32_t *uaddr, int op, int32_t val, /* * Check if NULL. Don't let users expect that they are taken into - * account. + * account. */ assert(!timeout); assert(!uaddr2); diff --git a/rculfhash.c b/rculfhash.c index 710751b..1976709 100644 --- a/rculfhash.c +++ b/rculfhash.c @@ -117,7 +117,7 @@ * To discuss these guarantees, we first define "read" operation as any * of the the basic cds_lfht_lookup, cds_lfht_next_duplicate, * cds_lfht_first, cds_lfht_next operation, as well as - * cds_lfht_add_unique (failure). + * cds_lfht_add_unique (failure). * * We define "read traversal" operation as any of the following * group of operations @@ -225,12 +225,12 @@ * shrink hash table from order 6 to 5: fini the index=6 bucket node table * * A bit of ascii art explanation: - * + * * The order index is the off-by-one compared to the actual power of 2 * because we use index 0 to deal with the 0 special-case. - * + * * This shows the nodes for a small table ordered by reversed bits: - * + * * bits reverse * 0 000 000 * 4 100 001 @@ -240,10 +240,10 @@ * 5 101 101 * 3 011 110 * 7 111 111 - * - * This shows the nodes in order of non-reversed bits, linked by + * + * This shows the nodes in order of non-reversed bits, linked by * reversed-bit order. - * + * * order bits reverse * 0 0 000 000 * 1 | 1 001 100 <- @@ -364,7 +364,7 @@ struct partition_resize_work { * Originally from Public Domain. */ -static const uint8_t BitReverseTable256[256] = +static const uint8_t BitReverseTable256[256] = { #define R2(n) (n), (n) + 2*64, (n) + 1*64, (n) + 3*64 #define R4(n) R2(n), R2((n) + 2*16), R2((n) + 1*16), R2((n) + 3*16) @@ -385,21 +385,21 @@ uint8_t bit_reverse_u8(uint8_t v) static uint32_t bit_reverse_u32(uint32_t v) { - return ((uint32_t) bit_reverse_u8(v) << 24) | - ((uint32_t) bit_reverse_u8(v >> 8) << 16) | - ((uint32_t) bit_reverse_u8(v >> 16) << 8) | + return ((uint32_t) bit_reverse_u8(v) << 24) | + ((uint32_t) bit_reverse_u8(v >> 8) << 16) | + ((uint32_t) bit_reverse_u8(v >> 16) << 8) | ((uint32_t) bit_reverse_u8(v >> 24)); } #else static uint64_t bit_reverse_u64(uint64_t v) { - return ((uint64_t) bit_reverse_u8(v) << 56) | - ((uint64_t) bit_reverse_u8(v >> 8) << 48) | + return ((uint64_t) bit_reverse_u8(v) << 56) | + ((uint64_t) bit_reverse_u8(v >> 8) << 48) | ((uint64_t) bit_reverse_u8(v >> 16) << 40) | ((uint64_t) bit_reverse_u8(v >> 24) << 32) | - ((uint64_t) bit_reverse_u8(v >> 32) << 24) | - ((uint64_t) bit_reverse_u8(v >> 40) << 16) | + ((uint64_t) bit_reverse_u8(v >> 32) << 24) | + ((uint64_t) bit_reverse_u8(v >> 40) << 16) | ((uint64_t) bit_reverse_u8(v >> 48) << 8) | ((uint64_t) bit_reverse_u8(v >> 56)); } diff --git a/urcu-bp.h b/urcu-bp.h index b40b3b6..7a265dc 100644 --- a/urcu-bp.h +++ b/urcu-bp.h @@ -180,7 +180,7 @@ static inline void rcu_thread_online(void) { } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu-call-rcu.h b/urcu-call-rcu.h index 98807ea..339ebac 100644 --- a/urcu-call-rcu.h +++ b/urcu-call-rcu.h @@ -94,7 +94,7 @@ void call_rcu_after_fork_child(void); void rcu_barrier(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu-defer.h b/urcu-defer.h index 3710081..43eca34 100644 --- a/urcu-defer.h +++ b/urcu-defer.h @@ -39,7 +39,7 @@ extern "C" { /* * Note: the defer_rcu() API is currently EXPERIMENTAL. It may change in the * future. - * + * * Important ! * * Each thread queuing memory reclamation must be registered with @@ -60,7 +60,7 @@ extern void rcu_defer_unregister_thread(void); extern void rcu_defer_barrier(void); extern void rcu_defer_barrier_thread(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu-pointer.h b/urcu-pointer.h index 18ea99e..dc1a0da 100644 --- a/urcu-pointer.h +++ b/urcu-pointer.h @@ -32,7 +32,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #if defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS) @@ -122,7 +122,7 @@ extern void *rcu_set_pointer_sym(void **p, void *v); */ #define rcu_assign_pointer(p, v) rcu_set_pointer((&p), (v)) -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu-qsbr.h b/urcu-qsbr.h index 82a045c..bf17361 100644 --- a/urcu-qsbr.h +++ b/urcu-qsbr.h @@ -39,7 +39,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #include @@ -127,7 +127,7 @@ extern void synchronize_rcu(void); extern void rcu_register_thread(void); extern void rcu_unregister_thread(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu.h b/urcu.h index b8ca700..85d4a4c 100644 --- a/urcu.h +++ b/urcu.h @@ -42,7 +42,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #include @@ -126,7 +126,7 @@ static inline void rcu_thread_online(void) { } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/arch/arm.h b/urcu/arch/arm.h index 9483bab..d7affaa 100644 --- a/urcu/arch/arm.h +++ b/urcu/arch/arm.h @@ -28,7 +28,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #ifdef CONFIG_RCU_ARM_HAVE_DMB #define cmm_mb() __asm__ __volatile__ ("dmb":::"memory") @@ -47,7 +47,7 @@ extern "C" { #define __NR_membarrier 389 #endif -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/arch/gcc.h b/urcu/arch/gcc.h index 8684a16..e5700e4 100644 --- a/urcu/arch/gcc.h +++ b/urcu/arch/gcc.h @@ -28,12 +28,12 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #include #include -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/arch/generic.h b/urcu/arch/generic.h index a80b3d6..e53ac56 100644 --- a/urcu/arch/generic.h +++ b/urcu/arch/generic.h @@ -62,7 +62,7 @@ extern "C" { /* * Architectures without cache coherency need something like the following: * - * #define cmm_mc() arch_cache_flush() + * #define cmm_mc() arch_cache_flush() * #define cmm_rmc() arch_cache_flush_read() * #define cmm_wmc() arch_cache_flush_write() * diff --git a/urcu/arch/ppc.h b/urcu/arch/ppc.h index 0bef952..dbdfec8 100644 --- a/urcu/arch/ppc.h +++ b/urcu/arch/ppc.h @@ -28,7 +28,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* Include size of POWER5+ L3 cache lines: 256 bytes */ #define CAA_CACHE_LINE_SIZE 256 @@ -115,7 +115,7 @@ static inline cycles_t caa_get_cycles(void) #define __NR_membarrier 365 #endif -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/arch/s390.h b/urcu/arch/s390.h index 86a0a36..e12c88c 100644 --- a/urcu/arch/s390.h +++ b/urcu/arch/s390.h @@ -34,7 +34,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #define CAA_CACHE_LINE_SIZE 128 @@ -61,7 +61,7 @@ static inline cycles_t caa_get_cycles (void) #define __NR_membarrier 356 #endif -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/arch/sparc64.h b/urcu/arch/sparc64.h index fb99450..6ce323f 100644 --- a/urcu/arch/sparc64.h +++ b/urcu/arch/sparc64.h @@ -28,7 +28,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #define CAA_CACHE_LINE_SIZE 256 @@ -45,7 +45,7 @@ __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \ #define cmm_rmb() membar_safe("#LoadLoad") #define cmm_wmb() membar_safe("#StoreStore") -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/arch/x86.h b/urcu/arch/x86.h index afbf4fa..a5b3a23 100644 --- a/urcu/arch/x86.h +++ b/urcu/arch/x86.h @@ -28,7 +28,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #define CAA_CACHE_LINE_SIZE 128 @@ -103,7 +103,7 @@ static inline cycles_t caa_get_cycles(void) #endif #endif -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/futex.h b/urcu/futex.h index 4beb54a..4d16cfa 100644 --- a/urcu/futex.h +++ b/urcu/futex.h @@ -28,7 +28,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 @@ -109,7 +109,7 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val, #endif -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/static/urcu-bp.h b/urcu/static/urcu-bp.h index 182e5fe..6e52d84 100644 --- a/urcu/static/urcu-bp.h +++ b/urcu/static/urcu-bp.h @@ -199,7 +199,7 @@ static inline int _rcu_read_ongoing(void) return URCU_TLS(rcu_reader)->ctr & RCU_GP_CTR_NEST_MASK; } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/static/urcu-pointer.h b/urcu/static/urcu-pointer.h index 06371e3..28333c5 100644 --- a/urcu/static/urcu-pointer.h +++ b/urcu/static/urcu-pointer.h @@ -36,7 +36,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /** * _rcu_dereference - reads (copy) a RCU-protected pointer to a local variable @@ -141,7 +141,7 @@ extern "C" { */ #define _rcu_assign_pointer(p, v) _rcu_set_pointer(&(p), v) -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/static/urcu-qsbr.h b/urcu/static/urcu-qsbr.h index 8e46820..8d5fd03 100644 --- a/urcu/static/urcu-qsbr.h +++ b/urcu/static/urcu-qsbr.h @@ -46,7 +46,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* * This code section can only be included in LGPL 2.1 compatible source code. @@ -234,7 +234,7 @@ static inline void _rcu_thread_online(void) cmm_smp_mb(); } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h index 92185d7..9082af7 100644 --- a/urcu/static/urcu.h +++ b/urcu/static/urcu.h @@ -46,7 +46,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* Default is RCU_MEMBARRIER */ #if !defined(RCU_MEMBARRIER) && !defined(RCU_MB) && !defined(RCU_SIGNAL) diff --git a/urcu/uatomic/arm.h b/urcu/uatomic/arm.h index e0016b8..fd8fe6a 100644 --- a/urcu/uatomic/arm.h +++ b/urcu/uatomic/arm.h @@ -1,7 +1,7 @@ #ifndef _URCU_ARCH_UATOMIC_ARM_H #define _URCU_ARCH_UATOMIC_ARM_H -/* +/* * Atomics for ARM. This approach is usable on kernels back to 2.6.15. * * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. @@ -29,12 +29,12 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* xchg */ #define uatomic_xchg(addr, v) __sync_lock_test_and_set(addr, v) -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/uatomic/gcc.h b/urcu/uatomic/gcc.h index 47ca195..438e039 100644 --- a/urcu/uatomic/gcc.h +++ b/urcu/uatomic/gcc.h @@ -1,7 +1,7 @@ #ifndef _URCU_ARCH_UATOMIC_GCC_H #define _URCU_ARCH_UATOMIC_GCC_H -/* +/* * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. * Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. @@ -27,7 +27,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* * If your platform doesn't have a full set of atomics, you will need @@ -37,7 +37,7 @@ extern "C" { #define UATOMIC_HAS_ATOMIC_BYTE #define UATOMIC_HAS_ATOMIC_SHORT -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/uatomic/ppc.h b/urcu/uatomic/ppc.h index 57fcd7a..0e672f5 100644 --- a/urcu/uatomic/ppc.h +++ b/urcu/uatomic/ppc.h @@ -1,7 +1,7 @@ #ifndef _URCU_ARCH_UATOMIC_PPC_H #define _URCU_ARCH_UATOMIC_PPC_H -/* +/* * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. * Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #define ILLEGAL_INSTR ".long 0xd00d00" @@ -228,7 +228,7 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val, caa_cast_long_keep_sign(v), \ sizeof(*(addr)))) -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/uatomic/s390.h b/urcu/uatomic/s390.h index 32c676e..62561e0 100644 --- a/urcu/uatomic/s390.h +++ b/urcu/uatomic/s390.h @@ -34,7 +34,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2) #define COMPILER_HAVE_SHORT_MEM_OPERAND @@ -152,7 +152,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old, caa_cast_long_keep_sign(_new),\ sizeof(*(addr))) -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/uatomic/sparc64.h b/urcu/uatomic/sparc64.h index 6294566..a9f2795 100644 --- a/urcu/uatomic/sparc64.h +++ b/urcu/uatomic/sparc64.h @@ -1,7 +1,7 @@ #ifndef _URCU_ARCH_UATOMIC_SPARC64_H #define _URCU_ARCH_UATOMIC_SPARC64_H -/* +/* * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. * Copyright (c) 1999-2003 by Hewlett-Packard Company. All rights reserved. @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* cmpxchg */ @@ -72,7 +72,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old, caa_cast_long_keep_sign(_new), \ sizeof(*(addr)))) -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/urcu/uatomic/unknown.h b/urcu/uatomic/unknown.h index 6fb4eb3..eb18526 100644 --- a/urcu/uatomic/unknown.h +++ b/urcu/uatomic/unknown.h @@ -1,7 +1,7 @@ #ifndef _URCU_ARCH_UATOMIC_UNKNOWN_H #define _URCU_ARCH_UATOMIC_UNKNOWN_H -/* +/* * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. * Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. diff --git a/urcu/uatomic/x86.h b/urcu/uatomic/x86.h index a139228..129a2f5 100644 --- a/urcu/uatomic/x86.h +++ b/urcu/uatomic/x86.h @@ -1,7 +1,7 @@ #ifndef _URCU_ARCH_UATOMIC_X86_H #define _URCU_ARCH_UATOMIC_X86_H -/* +/* * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. * Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. @@ -28,7 +28,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* * Derived from AO_compare_and_swap() and AO_test_and_set_full(). @@ -620,7 +620,7 @@ extern unsigned long _compat_uatomic_add_return(void *addr, #define cmm_smp_mb__before_uatomic_dec() cmm_barrier() #define cmm_smp_mb__after_uatomic_dec() cmm_barrier() -#ifdef __cplusplus +#ifdef __cplusplus } #endif -- 2.34.1