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

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

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: generic atomic64 support
parents dfd07ec3 eacb6ec9

arch/microblaze/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ config MICROBLAZE 
	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP

	select GENERIC_PCI_IOMAP

	select GENERIC_CPU_DEVICES

	select GENERIC_CPU_DEVICES

	select GENERIC_ATOMIC64





config SWAP

config SWAP

	def_bool n

	def_bool n

arch/microblaze/include/asm/atomic.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_MICROBLAZE_ATOMIC_H

#define _ASM_MICROBLAZE_ATOMIC_H





#include <asm-generic/atomic.h>

#include <asm-generic/atomic.h>

#include <asm-generic/atomic64.h>





/*

/*

 * Atomically test *v and decrement if it is greater than 0.

 * Atomically test *v and decrement if it is greater than 0.