1
0
Fork 0
alistair23-linux/arch/mn10300/include/asm
Linus Torvalds 9f3938346a Merge branch 'kmap_atomic' of git://github.com/congwang/linux
Pull kmap_atomic cleanup from Cong Wang.

It's been in -next for a long time, and it gets rid of the (no longer
used) second argument to k[un]map_atomic().

Fix up a few trivial conflicts in various drivers, and do an "evil
merge" to catch some new uses that have come in since Cong's tree.

* 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
  feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
  highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
  drbd: remove the second argument of k[un]map_atomic()
  zcache: remove the second argument of k[un]map_atomic()
  gma500: remove the second argument of k[un]map_atomic()
  dm: remove the second argument of k[un]map_atomic()
  tomoyo: remove the second argument of k[un]map_atomic()
  sunrpc: remove the second argument of k[un]map_atomic()
  rds: remove the second argument of k[un]map_atomic()
  net: remove the second argument of k[un]map_atomic()
  mm: remove the second argument of k[un]map_atomic()
  lib: remove the second argument of k[un]map_atomic()
  power: remove the second argument of k[un]map_atomic()
  kdb: remove the second argument of k[un]map_atomic()
  udf: remove the second argument of k[un]map_atomic()
  ubifs: remove the second argument of k[un]map_atomic()
  squashfs: remove the second argument of k[un]map_atomic()
  reiserfs: remove the second argument of k[un]map_atomic()
  ocfs2: remove the second argument of k[un]map_atomic()
  ntfs: remove the second argument of k[un]map_atomic()
  ...
2012-03-21 09:40:26 -07:00
..
Kbuild Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h atomic: cleanup asm-generic atomic*.h inclusion 2011-07-26 16:49:47 -07:00
auxvec.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
bitops.h asm-generic: add another generic ext2 atomic bitops 2011-07-26 16:49:46 -07:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bug.h MN10300: Stop gcc from generating uninitialised variable warnings after BUG() 2009-04-15 13:55:13 -07:00
bugs.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
busctl-regs.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
byteorder.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
cache.h MN10300: Don't hard code the cacheline size in register defs 2010-10-27 17:28:39 +01:00
cacheflush.h MN10300: Allow some cacheflushes to be avoided if cache snooping is available 2010-10-27 17:28:46 +01:00
checksum.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
cpu-regs.h Fix common misspellings 2011-03-31 11:26:23 -03:00
cputime.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
current.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
debugger.h MN10300: Create generic kernel debugger hooks 2011-03-18 16:54:30 +00:00
delay.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
device.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
div64.h MN10300: gcc 4.6 vs am33 inline assembly 2011-03-23 17:42:49 +00:00
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
dmactl-regs.h MN10300: Move DMA engine control reg defs to MN103E010 processor directory 2010-10-27 17:28:39 +01:00
elf.h MN10300: Specify an ELF HWCAP flag for MN10300 Atomic Operations Unit support 2010-10-27 17:28:56 +01:00
emergency-restart.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
errno.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
exceptions.h treewide: convert uses of ATTRIB_NORETURN to __noreturn 2012-01-12 20:13:03 -08:00
fb.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
fcntl.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
fpu.h MN10300: Create generic kernel debugger hooks 2011-03-18 16:54:30 +00:00
frame.inc MN10300: Save frame pointer in thread_info struct rather than global var 2010-10-27 17:29:01 +01:00
ftrace.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
futex.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
gdb-stub.h MN10300: Provide a MN10300_CACHE_ENABLED config option 2010-10-27 17:28:42 +01:00
hardirq.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
highmem.h highmem: kill all __kmap_atomic() 2012-03-20 21:48:30 +08:00
hw_irq.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
intctl-regs.h MN10300: Remove unused mn10300_intc_* functions 2011-03-18 16:52:51 +00:00
io.h mn10300: switch to GENERIC_PCI_IOMAP 2011-12-04 16:00:17 +02:00
ioctl.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
ioctls.h ioctl: Use asm-generic/ioctls.h on mn10300 (enables termiox) 2010-10-22 10:20:01 -07:00
ipc.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
ipcbuf.h consolidate a bunch of ipcbuf.h instances 2012-01-03 22:55:18 -05:00
irq.h MN10300: ASB2364: Handle the IRQ multiplexer in the FPGA 2010-10-27 17:28:58 +01:00
irq_regs.h MN10300: Save frame pointer in thread_info struct rather than global var 2010-10-27 17:29:01 +01:00
irqflags.h MN10300: Create generic kernel debugger hooks 2011-03-18 16:54:30 +00:00
kdebug.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
kgdb.h MN10300: Use KGDB 2011-03-18 16:54:31 +00:00
kmap_types.h kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
kprobes.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
linkage.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
local.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
mc146818rtc.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
mman.h arch_mmap_check() on mn10300 2009-12-11 06:34:10 -05:00
mmu.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
mmu_context.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
module.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
msgbuf.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
mutex.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
nmi.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
page.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
page_offset.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
param.h UAPI: Make MN10300 use asm-generic/param.h 2011-12-12 13:54:36 +00:00
pci.h PCI: remove pcibios_scan_all_fns() 2009-09-09 13:29:18 -07:00
percpu.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
pgalloc.h MN10300: Save frame pointer in thread_info struct rather than global var 2010-10-27 17:29:01 +01:00
pgtable.h MN10300: Map userspace atomic op regs as a vmalloc page 2010-10-27 17:28:56 +01:00
pio-regs.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
poll.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
posix_types.h MN10300: Fix size_t and ssize_t 2010-08-12 09:51:35 -07:00
processor.h mn10300, exec: remove redundant set_fs(USER_DS) 2011-07-26 16:49:41 -07:00
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
reset-regs.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
resource.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
rtc-regs.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
rtc.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
rwlock.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
sections.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
sembuf.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
serial-regs.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
serial.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
setup.h headers_check fix: mn10300, setup.h 2009-06-14 11:51:12 +05:30
shmbuf.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
shmparam.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
sigcontext.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
siginfo.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
signal.h MN10300: Fix SIGRTMAX 2010-09-23 10:20:57 -07:00
smp.h MN10300: Use KGDB 2011-03-18 16:54:31 +00:00
smsc911x.h MN10300: ASB2364: Add support for SMSC911X and SMC911X 2010-10-27 17:28:58 +01:00
socket.h net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
sockios.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
spinlock.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
spinlock_types.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
stat.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
statfs.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
string.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
swab.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
syscall.h MN10300: Implement asm/syscall.h 2010-12-03 09:18:53 -08:00
system.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
termbits.h tty: Add EXTPROC support for LINEMODE 2010-08-10 13:47:39 -07:00
termios.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
thread_info.h freezer: remove now unused TIF_FREEZE 2011-11-21 12:32:25 -08:00
timer-regs.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
timex.h MN10300: Generic time support 2010-10-27 17:28:57 +01:00
tlb.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
tlbflush.h MN10300: SMP TLB flushing 2010-10-27 17:28:51 +01:00
topology.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
types.h consolidate umode_t declarations 2012-01-03 22:55:17 -05:00
uaccess.h MN10300: asm/uaccess.h needs to #include linux/kernel.h for might_sleep() 2011-06-21 18:31:44 -07:00
ucontext.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
unaligned.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
unistd.h ns: Wire up the setns system call 2011-05-28 10:48:39 -07:00
user.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
vga.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00
xor.h Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. 2009-04-10 14:19:03 +01:00