Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f16d10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Mark atomic irq ops raw for 32bit legacy
  x86: Merge show_regs()
  x86: Macroise x86 cache descriptors
  x86-32: clean up rwsem inline asm statements
  x86: Merge asm/atomic_{32,64}.h
  x86: Sync asm/atomic_32.h and asm/atomic_64.h
  x86: Split atomic64_t functions into seperate headers
  x86-64: Modify memcpy()/memset() alternatives mechanism
  x86-64: Modify copy_user_generic() alternatives mechanism
  x86: Lift restriction on the location of FIX_BTMAP_*
  x86, core: Optimize hweight32()
parents f66ffded 17c0e710

arch/x86/include/asm/alternative.h

+6 −1
Original line number Diff line number Diff line
@@ -130,11 +130,16 @@ static inline int alternatives_text_reserved(void *start, void *end) 
	asm volatile (ALTERNATIVE(oldinstr, newinstr, feature)		\

		: output : "i" (0), ## input)



/* Like alternative_io, but for replacing a direct call with another one. */

#define alternative_call(oldfunc, newfunc, feature, output, input...)	\

	asm volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \

		: output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)



/*

 * use this macro(s) if you need more than one output parameter

 * in alternative_io

 */

#define ASM_OUTPUT2(a, b) a, b

#define ASM_OUTPUT2(a...) a



struct paravirt_patch_site;

#ifdef CONFIG_PARAVIRT

arch/x86/include/asm/atomic.h

+297 −2
Original line number Diff line number Diff line 
#ifndef _ASM_X86_ATOMIC_H

#define _ASM_X86_ATOMIC_H



#include <linux/compiler.h>

#include <linux/types.h>

#include <asm/processor.h>

#include <asm/alternative.h>

#include <asm/cmpxchg.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for

 * resource counting etc..

 */



#define ATOMIC_INIT(i)	{ (i) }



/**

 * atomic_read - read atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically reads the value of @v.

 */

static inline int atomic_read(const atomic_t *v)

{

	return v->counter;

}



/**

 * atomic_set - set atomic variable

 * @v: pointer of type atomic_t

 * @i: required value

 *

 * Atomically sets the value of @v to @i.

 */

static inline void atomic_set(atomic_t *v, int i)

{

	v->counter = i;

}



/**

 * atomic_add - add integer to atomic variable

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v.

 */

static inline void atomic_add(int i, atomic_t *v)

{

	asm volatile(LOCK_PREFIX "addl %1,%0"

		     : "+m" (v->counter)

		     : "ir" (i));

}



/**

 * atomic_sub - subtract integer from atomic variable

 * @i: integer value to subtract

 * @v: pointer of type atomic_t

 *

 * Atomically subtracts @i from @v.

 */

static inline void atomic_sub(int i, atomic_t *v)

{

	asm volatile(LOCK_PREFIX "subl %1,%0"

		     : "+m" (v->counter)

		     : "ir" (i));

}



/**

 * atomic_sub_and_test - subtract value from variable and test result

 * @i: integer value to subtract

 * @v: pointer of type atomic_t

 *

 * Atomically subtracts @i from @v and returns

 * true if the result is zero, or false for all

 * other cases.

 */

static inline int atomic_sub_and_test(int i, atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"

		     : "+m" (v->counter), "=qm" (c)

		     : "ir" (i) : "memory");

	return c;

}



/**

 * atomic_inc - increment atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1.

 */

static inline void atomic_inc(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "incl %0"

		     : "+m" (v->counter));

}



/**

 * atomic_dec - decrement atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically decrements @v by 1.

 */

static inline void atomic_dec(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "decl %0"

		     : "+m" (v->counter));

}



/**

 * atomic_dec_and_test - decrement and test

 * @v: pointer of type atomic_t

 *

 * Atomically decrements @v by 1 and

 * returns true if the result is 0, or false for all other

 * cases.

 */

static inline int atomic_dec_and_test(atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "decl %0; sete %1"

		     : "+m" (v->counter), "=qm" (c)

		     : : "memory");

	return c != 0;

}



/**

 * atomic_inc_and_test - increment and test

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1

 * and returns true if the result is zero, or false for all

 * other cases.

 */

static inline int atomic_inc_and_test(atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "incl %0; sete %1"

		     : "+m" (v->counter), "=qm" (c)

		     : : "memory");

	return c != 0;

}



/**

 * atomic_add_negative - add and test if negative

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v and returns true

 * if the result is negative, or false when

 * result is greater than or equal to zero.

 */

static inline int atomic_add_negative(int i, atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"

		     : "+m" (v->counter), "=qm" (c)

		     : "ir" (i) : "memory");

	return c;

}



/**

 * atomic_add_return - add integer and return

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v and returns @i + @v

 */

static inline int atomic_add_return(int i, atomic_t *v)

{

	int __i;

#ifdef CONFIG_M386

	unsigned long flags;

	if (unlikely(boot_cpu_data.x86 <= 3))

		goto no_xadd;

#endif

	/* Modern 486+ processor */

	__i = i;

	asm volatile(LOCK_PREFIX "xaddl %0, %1"

		     : "+r" (i), "+m" (v->counter)

		     : : "memory");

	return i + __i;



#ifdef CONFIG_M386

no_xadd: /* Legacy 386 processor */

	raw_local_irq_save(flags);

	__i = atomic_read(v);

	atomic_set(v, i + __i);

	raw_local_irq_restore(flags);

	return i + __i;

#endif

}



/**

 * atomic_sub_return - subtract integer and return

 * @v: pointer of type atomic_t

 * @i: integer value to subtract

 *

 * Atomically subtracts @i from @v and returns @v - @i

 */

static inline int atomic_sub_return(int i, atomic_t *v)

{

	return atomic_add_return(-i, v);

}



#define atomic_inc_return(v)  (atomic_add_return(1, v))

#define atomic_dec_return(v)  (atomic_sub_return(1, v))



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)

{

	return cmpxchg(&v->counter, old, new);

}



static inline int atomic_xchg(atomic_t *v, int new)

{

	return xchg(&v->counter, new);

}



/**

 * atomic_add_unless - add unless the number is already a given value

 * @v: pointer of type atomic_t

 * @a: the amount to add to v...

 * @u: ...unless v is equal to u.

 *

 * Atomically adds @a to @v, so long as @v was not already @u.

 * Returns non-zero if @v was not @u, and zero otherwise.

 */

static inline int atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;

	c = atomic_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



/**

 * atomic_inc_short - increment of a short integer

 * @v: pointer to type int

 *

 * Atomically adds 1 to @v

 * Returns the new value of @u

 */

static inline short int atomic_inc_short(short int *v)

{

	asm(LOCK_PREFIX "addw $1, %0" : "+m" (*v));

	return *v;

}



#ifdef CONFIG_X86_64

/**

 * atomic_or_long - OR of two long integers

 * @v1: pointer to type unsigned long

 * @v2: pointer to type unsigned long

 *

 * Atomically ORs @v1 and @v2

 * Returns the result of the OR

 */

static inline void atomic_or_long(unsigned long *v1, unsigned long v2)

{

	asm(LOCK_PREFIX "orq %1, %0" : "+m" (*v1) : "r" (v2));

}

#endif



/* These are x86-specific, used by some header files */

#define atomic_clear_mask(mask, addr)				\

	asm volatile(LOCK_PREFIX "andl %0,%1"			\

		     : : "r" (~(mask)), "m" (*(addr)) : "memory")



#define atomic_set_mask(mask, addr)				\

	asm volatile(LOCK_PREFIX "orl %0,%1"			\

		     : : "r" ((unsigned)(mask)), "m" (*(addr))	\

		     : "memory")



/* Atomic operations are already serializing on x86 */

#define smp_mb__before_atomic_dec()	barrier()

#define smp_mb__after_atomic_dec()	barrier()

#define smp_mb__before_atomic_inc()	barrier()

#define smp_mb__after_atomic_inc()	barrier()



#ifdef CONFIG_X86_32

# include "atomic_32.h"

# include "atomic64_32.h"

#else

# include "atomic_64.h"

# include "atomic64_64.h"

#endif



#include <asm-generic/atomic-long.h>

#endif /* _ASM_X86_ATOMIC_H */

arch/x86/include/asm/atomic_32.h→arch/x86/include/asm/atomic64_32.h

+160 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_ATOMIC_32_H

#define _ASM_X86_ATOMIC_32_H

#ifndef _ASM_X86_ATOMIC64_32_H

#define _ASM_X86_ATOMIC64_32_H



#include <linux/compiler.h>

#include <linux/types.h>

#include <asm/processor.h>

#include <asm/cmpxchg.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for

 * resource counting etc..

 */



#define ATOMIC_INIT(i)	{ (i) }



/**

 * atomic_read - read atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically reads the value of @v.

 */

static inline int atomic_read(const atomic_t *v)

{

	return v->counter;

}



/**

 * atomic_set - set atomic variable

 * @v: pointer of type atomic_t

 * @i: required value

 *

 * Atomically sets the value of @v to @i.

 */

static inline void atomic_set(atomic_t *v, int i)

{

	v->counter = i;

}



/**

 * atomic_add - add integer to atomic variable

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v.

 */

static inline void atomic_add(int i, atomic_t *v)

{

	asm volatile(LOCK_PREFIX "addl %1,%0"

		     : "+m" (v->counter)

		     : "ir" (i));

}



/**

 * atomic_sub - subtract integer from atomic variable

 * @i: integer value to subtract

 * @v: pointer of type atomic_t

 *

 * Atomically subtracts @i from @v.

 */

static inline void atomic_sub(int i, atomic_t *v)

{

	asm volatile(LOCK_PREFIX "subl %1,%0"

		     : "+m" (v->counter)

		     : "ir" (i));

}



/**

 * atomic_sub_and_test - subtract value from variable and test result

 * @i: integer value to subtract

 * @v: pointer of type atomic_t

 *

 * Atomically subtracts @i from @v and returns

 * true if the result is zero, or false for all

 * other cases.

 */

static inline int atomic_sub_and_test(int i, atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"

		     : "+m" (v->counter), "=qm" (c)

		     : "ir" (i) : "memory");

	return c;

}



/**

 * atomic_inc - increment atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1.

 */

static inline void atomic_inc(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "incl %0"

		     : "+m" (v->counter));

}



/**

 * atomic_dec - decrement atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically decrements @v by 1.

 */

static inline void atomic_dec(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "decl %0"

		     : "+m" (v->counter));

}



/**

 * atomic_dec_and_test - decrement and test

 * @v: pointer of type atomic_t

 *

 * Atomically decrements @v by 1 and

 * returns true if the result is 0, or false for all other

 * cases.

 */

static inline int atomic_dec_and_test(atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "decl %0; sete %1"

		     : "+m" (v->counter), "=qm" (c)

		     : : "memory");

	return c != 0;

}



/**

 * atomic_inc_and_test - increment and test

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1

 * and returns true if the result is zero, or false for all

 * other cases.

 */

static inline int atomic_inc_and_test(atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "incl %0; sete %1"

		     : "+m" (v->counter), "=qm" (c)

		     : : "memory");

	return c != 0;

}



/**

 * atomic_add_negative - add and test if negative

 * @v: pointer of type atomic_t

 * @i: integer value to add

 *

 * Atomically adds @i to @v and returns true

 * if the result is negative, or false when

 * result is greater than or equal to zero.

 */

static inline int atomic_add_negative(int i, atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"

		     : "+m" (v->counter), "=qm" (c)

		     : "ir" (i) : "memory");

	return c;

}



/**

 * atomic_add_return - add integer and return

 * @v: pointer of type atomic_t

 * @i: integer value to add

 *

 * Atomically adds @i to @v and returns @i + @v

 */

static inline int atomic_add_return(int i, atomic_t *v)

{

	int __i;

#ifdef CONFIG_M386

	unsigned long flags;

	if (unlikely(boot_cpu_data.x86 <= 3))

		goto no_xadd;

#endif

	/* Modern 486+ processor */

	__i = i;

	asm volatile(LOCK_PREFIX "xaddl %0, %1"

		     : "+r" (i), "+m" (v->counter)

		     : : "memory");

	return i + __i;



#ifdef CONFIG_M386

no_xadd: /* Legacy 386 processor */

	local_irq_save(flags);

	__i = atomic_read(v);

	atomic_set(v, i + __i);

	local_irq_restore(flags);

	return i + __i;

#endif

}



/**

 * atomic_sub_return - subtract integer and return

 * @v: pointer of type atomic_t

 * @i: integer value to subtract

 *

 * Atomically subtracts @i from @v and returns @v - @i

 */

static inline int atomic_sub_return(int i, atomic_t *v)

{

	return atomic_add_return(-i, v);

}



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)

{

	return cmpxchg(&v->counter, old, new);

}



static inline int atomic_xchg(atomic_t *v, int new)

{

	return xchg(&v->counter, new);

}



/**

 * atomic_add_unless - add unless the number is already a given value

 * @v: pointer of type atomic_t

 * @a: the amount to add to v...

 * @u: ...unless v is equal to u.

 *

 * Atomically adds @a to @v, so long as @v was not already @u.

 * Returns non-zero if @v was not @u, and zero otherwise.

 */

static inline int atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;

	c = atomic_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



#define atomic_inc_return(v)  (atomic_add_return(1, v))

#define atomic_dec_return(v)  (atomic_sub_return(1, v))



/* These are x86-specific, used by some header files */

#define atomic_clear_mask(mask, addr)				\

	asm volatile(LOCK_PREFIX "andl %0,%1"			\

		     : : "r" (~(mask)), "m" (*(addr)) : "memory")



#define atomic_set_mask(mask, addr)				\

	asm volatile(LOCK_PREFIX "orl %0,%1"				\

		     : : "r" (mask), "m" (*(addr)) : "memory")



/* Atomic operations are already serializing on x86 */

#define smp_mb__before_atomic_dec()	barrier()

#define smp_mb__after_atomic_dec()	barrier()

#define smp_mb__before_atomic_inc()	barrier()

#define smp_mb__after_atomic_inc()	barrier()

//#include <asm/cmpxchg.h>



/* An 64bit atomic type */
@@ -411,5 +157,4 @@ extern int atomic64_inc_and_test(atomic64_t *ptr); 
 */

extern int atomic64_add_negative(u64 delta, atomic64_t *ptr);



#include <asm-generic/atomic-long.h>

#endif /* _ASM_X86_ATOMIC_32_H */
 
#endif /* _ASM_X86_ATOMIC64_32_H */

arch/x86/include/asm/atomic_64.h→arch/x86/include/asm/atomic64_64.h

+224 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_ATOMIC_64_H

#define _ASM_X86_ATOMIC_64_H

#ifndef _ASM_X86_ATOMIC64_64_H

#define _ASM_X86_ATOMIC64_64_H



#include <linux/types.h>

#include <asm/alternative.h>

#include <asm/cmpxchg.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for

 * resource counting etc..

 */



#define ATOMIC_INIT(i)	{ (i) }



/**

 * atomic_read - read atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically reads the value of @v.

 */

static inline int atomic_read(const atomic_t *v)

{

	return v->counter;

}



/**

 * atomic_set - set atomic variable

 * @v: pointer of type atomic_t

 * @i: required value

 *

 * Atomically sets the value of @v to @i.

 */

static inline void atomic_set(atomic_t *v, int i)

{

	v->counter = i;

}



/**

 * atomic_add - add integer to atomic variable

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v.

 */

static inline void atomic_add(int i, atomic_t *v)

{

	asm volatile(LOCK_PREFIX "addl %1,%0"

		     : "=m" (v->counter)

		     : "ir" (i), "m" (v->counter));

}



/**

 * atomic_sub - subtract the atomic variable

 * @i: integer value to subtract

 * @v: pointer of type atomic_t

 *

 * Atomically subtracts @i from @v.

 */

static inline void atomic_sub(int i, atomic_t *v)

{

	asm volatile(LOCK_PREFIX "subl %1,%0"

		     : "=m" (v->counter)

		     : "ir" (i), "m" (v->counter));

}



/**

 * atomic_sub_and_test - subtract value from variable and test result

 * @i: integer value to subtract

 * @v: pointer of type atomic_t

 *

 * Atomically subtracts @i from @v and returns

 * true if the result is zero, or false for all

 * other cases.

 */

static inline int atomic_sub_and_test(int i, atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"

		     : "=m" (v->counter), "=qm" (c)

		     : "ir" (i), "m" (v->counter) : "memory");

	return c;

}



/**

 * atomic_inc - increment atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1.

 */

static inline void atomic_inc(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "incl %0"

		     : "=m" (v->counter)

		     : "m" (v->counter));

}



/**

 * atomic_dec - decrement atomic variable

 * @v: pointer of type atomic_t

 *

 * Atomically decrements @v by 1.

 */

static inline void atomic_dec(atomic_t *v)

{

	asm volatile(LOCK_PREFIX "decl %0"

		     : "=m" (v->counter)

		     : "m" (v->counter));

}



/**

 * atomic_dec_and_test - decrement and test

 * @v: pointer of type atomic_t

 *

 * Atomically decrements @v by 1 and

 * returns true if the result is 0, or false for all other

 * cases.

 */

static inline int atomic_dec_and_test(atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "decl %0; sete %1"

		     : "=m" (v->counter), "=qm" (c)

		     : "m" (v->counter) : "memory");

	return c != 0;

}



/**

 * atomic_inc_and_test - increment and test

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1

 * and returns true if the result is zero, or false for all

 * other cases.

 */

static inline int atomic_inc_and_test(atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "incl %0; sete %1"

		     : "=m" (v->counter), "=qm" (c)

		     : "m" (v->counter) : "memory");

	return c != 0;

}



/**

 * atomic_add_negative - add and test if negative

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v and returns true

 * if the result is negative, or false when

 * result is greater than or equal to zero.

 */

static inline int atomic_add_negative(int i, atomic_t *v)

{

	unsigned char c;



	asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"

		     : "=m" (v->counter), "=qm" (c)

		     : "ir" (i), "m" (v->counter) : "memory");

	return c;

}



/**

 * atomic_add_return - add and return

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v and returns @i + @v

 */

static inline int atomic_add_return(int i, atomic_t *v)

{

	int __i = i;

	asm volatile(LOCK_PREFIX "xaddl %0, %1"

		     : "+r" (i), "+m" (v->counter)

		     : : "memory");

	return i + __i;

}



static inline int atomic_sub_return(int i, atomic_t *v)

{

	return atomic_add_return(-i, v);

}



#define atomic_inc_return(v)  (atomic_add_return(1, v))

#define atomic_dec_return(v)  (atomic_sub_return(1, v))



/* The 64-bit atomic type */



#define ATOMIC64_INIT(i)	{ (i) }
@@ -377,42 +195,6 @@ static inline long atomic64_xchg(atomic64_t *v, long new) 
	return xchg(&v->counter, new);

}



static inline long atomic_cmpxchg(atomic_t *v, int old, int new)

{

	return cmpxchg(&v->counter, old, new);

}



static inline long atomic_xchg(atomic_t *v, int new)

{

	return xchg(&v->counter, new);

}



/**

 * atomic_add_unless - add unless the number is a given value

 * @v: pointer of type atomic_t

 * @a: the amount to add to v...

 * @u: ...unless v is equal to u.

 *

 * Atomically adds @a to @v, so long as it was not @u.

 * Returns non-zero if @v was not @u, and zero otherwise.

 */

static inline int atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;

	c = atomic_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



/**

 * atomic64_add_unless - add unless the number is a given value

 * @v: pointer of type atomic64_t
@@ -437,49 +219,6 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u) 
	return c != (u);

}



/**

 * atomic_inc_short - increment of a short integer

 * @v: pointer to type int

 *

 * Atomically adds 1 to @v

 * Returns the new value of @u

 */

static inline short int atomic_inc_short(short int *v)

{

	asm(LOCK_PREFIX "addw $1, %0" : "+m" (*v));

	return *v;

}



/**

 * atomic_or_long - OR of two long integers

 * @v1: pointer to type unsigned long

 * @v2: pointer to type unsigned long

 *

 * Atomically ORs @v1 and @v2

 * Returns the result of the OR

 */

static inline void atomic_or_long(unsigned long *v1, unsigned long v2)

{

	asm(LOCK_PREFIX "orq %1, %0" : "+m" (*v1) : "r" (v2));

}



#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)



/* These are x86-specific, used by some header files */

#define atomic_clear_mask(mask, addr)					\

	asm volatile(LOCK_PREFIX "andl %0,%1"				\

		     : : "r" (~(mask)), "m" (*(addr)) : "memory")



#define atomic_set_mask(mask, addr)					\

	asm volatile(LOCK_PREFIX "orl %0,%1"				\

		     : : "r" ((unsigned)(mask)), "m" (*(addr))		\

		     : "memory")



/* Atomic operations are already serializing on x86 */

#define smp_mb__before_atomic_dec()	barrier()

#define smp_mb__after_atomic_dec()	barrier()

#define smp_mb__before_atomic_inc()	barrier()

#define smp_mb__after_atomic_inc()	barrier()



#include <asm-generic/atomic-long.h>

#endif /* _ASM_X86_ATOMIC_64_H */
 
#endif /* _ASM_X86_ATOMIC64_64_H */

arch/x86/include/asm/fixmap.h

+11 −5
Original line number Diff line number Diff line
@@ -118,14 +118,20 @@ enum fixed_addresses { 
	 * 256 temporary boot-time mappings, used by early_ioremap(),

	 * before ioremap() is functional.

	 *

	 * We round it up to the next 256 pages boundary so that we

	 * can have a single pgd entry and a single pte table:

	 * If necessary we round it up to the next 256 pages boundary so

	 * that we can have a single pgd entry and a single pte table:

	 */

#define NR_FIX_BTMAPS		64

#define FIX_BTMAPS_SLOTS	4

	FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -

			(__end_of_permanent_fixed_addresses & 255),

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,

#define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)

	FIX_BTMAP_END =

	 (__end_of_permanent_fixed_addresses ^

	  (__end_of_permanent_fixed_addresses + TOTAL_FIX_BTMAPS - 1)) &

	 -PTRS_PER_PTE

	 ? __end_of_permanent_fixed_addresses + TOTAL_FIX_BTMAPS -

	   (__end_of_permanent_fixed_addresses & (TOTAL_FIX_BTMAPS - 1))

	 : __end_of_permanent_fixed_addresses,

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1,

#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

	FIX_OHCI1394_BASE,

#endif