Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Linus Torvalds 13 years ago
parent
dfd07ec3fa eacb6ec9ae
commit
f07d4a7647
2 changed files with 2 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      arch/microblaze/Kconfig
  2. 1 0
      arch/microblaze/include/asm/atomic.h

+ 1 - 0
arch/microblaze/Kconfig
View File 

@@ -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

+ 1 - 0
arch/microblaze/include/asm/atomic.h
View File 

@@ -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.