From b316644344b3a9b289ffe6a174a0376edc724efb Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 8 May 2007 00:34:46 -0700 Subject: [PATCH] --- yaml --- r: 54799 b: refs/heads/master c: 4431f46f5fe0e3b740dfaf09ba34f0b14688185e h: refs/heads/master i: 54797: 54248cadf1e3e36cdf52c0b62d3dcea83e852160 54795: da18f32cab089c8182cfb8cd3f41b84d5b3daa3c 54791: 0ccd4b5542ed090f100184550d1aad2884291d21 54783: 0f9f331f48e2740dee12ca32115d95c7d008b369 v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/local.h | 51 +--------------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/[refs] b/[refs] index ed823c90584c..7513d748eb1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a075227948636e10aa2cc2d8725fbbab27681d4a +refs/heads/master: 4431f46f5fe0e3b740dfaf09ba34f0b14688185e diff --git a/trunk/include/asm-ia64/local.h b/trunk/include/asm-ia64/local.h index dc519092ef4d..c11c530f74d0 100644 --- a/trunk/include/asm-ia64/local.h +++ b/trunk/include/asm-ia64/local.h @@ -1,50 +1 @@ -#ifndef _ASM_IA64_LOCAL_H -#define _ASM_IA64_LOCAL_H - -/* - * Copyright (C) 2003 Hewlett-Packard Co - * David Mosberger-Tang - */ - -#include - -typedef struct { - atomic64_t val; -} local_t; - -#define LOCAL_INIT(i) ((local_t) { { (i) } }) -#define local_read(l) atomic64_read(&(l)->val) -#define local_set(l, i) atomic64_set(&(l)->val, i) -#define local_inc(l) atomic64_inc(&(l)->val) -#define local_dec(l) atomic64_dec(&(l)->val) -#define local_add(i, l) atomic64_add((i), &(l)->val) -#define local_sub(i, l) atomic64_sub((i), &(l)->val) - -/* Non-atomic variants, i.e., preemption disabled and won't be touched in interrupt, etc. */ - -#define __local_inc(l) (++(l)->val.counter) -#define __local_dec(l) (--(l)->val.counter) -#define __local_add(i,l) ((l)->val.counter += (i)) -#define __local_sub(i,l) ((l)->val.counter -= (i)) - -/* - * Use these for per-cpu local_t variables. Note they take a variable (eg. mystruct.foo), - * not an address. - */ -#define cpu_local_read(v) local_read(&__ia64_per_cpu_var(v)) -#define cpu_local_set(v, i) local_set(&__ia64_per_cpu_var(v), (i)) -#define cpu_local_inc(v) local_inc(&__ia64_per_cpu_var(v)) -#define cpu_local_dec(v) local_dec(&__ia64_per_cpu_var(v)) -#define cpu_local_add(i, v) local_add((i), &__ia64_per_cpu_var(v)) -#define cpu_local_sub(i, v) local_sub((i), &__ia64_per_cpu_var(v)) - -/* - * Non-atomic increments, i.e., preemption disabled and won't be touched in interrupt, - * etc. - */ -#define __cpu_local_inc(v) __local_inc(&__ia64_per_cpu_var(v)) -#define __cpu_local_dec(v) __local_dec(&__ia64_per_cpu_var(v)) -#define __cpu_local_add(i, v) __local_add((i), &__ia64_per_cpu_var(v)) -#define __cpu_local_sub(i, v) __local_sub((i), &__ia64_per_cpu_var(v)) - -#endif /* _ASM_IA64_LOCAL_H */ +#include