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() ... |
||
|---|---|---|
| .. | ||
| Kbuild | ||
| asm-offsets.h | ||
| atomic.h | ||
| auxvec.h | ||
| ax88796.h | ||
| bitops.h | ||
| bitsperlong.h | ||
| bug.h | ||
| bugs.h | ||
| busctl-regs.h | ||
| byteorder.h | ||
| cache.h | ||
| cacheflush.h | ||
| checksum.h | ||
| cpu-irqs.h | ||
| cpumask.h | ||
| cputime.h | ||
| current.h | ||
| delay.h | ||
| device.h | ||
| div64.h | ||
| dm9000.h | ||
| dma-mapping.h | ||
| dma.h | ||
| elf.h | ||
| emergency-restart.h | ||
| errno.h | ||
| fb.h | ||
| fcntl.h | ||
| fpu.h | ||
| ftrace.h | ||
| futex.h | ||
| gdb-stub.h | ||
| gpio-regs.h | ||
| hardirq.h | ||
| highmem.h | ||
| hw_irq.h | ||
| io.h | ||
| ioctl.h | ||
| ioctls.h | ||
| ipcbuf.h | ||
| irc-regs.h | ||
| irq.h | ||
| irq_regs.h | ||
| irqflags.h | ||
| kdebug.h | ||
| kmap_types.h | ||
| linkage.h | ||
| local.h | ||
| local64.h | ||
| math-emu.h | ||
| mb-regs.h | ||
| mb86943a.h | ||
| mb93091-fpga-irqs.h | ||
| mb93093-fpga-irqs.h | ||
| mb93493-irqs.h | ||
| mb93493-regs.h | ||
| mc146818rtc.h | ||
| mem-layout.h | ||
| mman.h | ||
| mmu.h | ||
| mmu_context.h | ||
| module.h | ||
| msgbuf.h | ||
| mutex.h | ||
| page.h | ||
| param.h | ||
| pci.h | ||
| percpu.h | ||
| perf_event.h | ||
| pgalloc.h | ||
| pgtable.h | ||
| poll.h | ||
| posix_types.h | ||
| processor.h | ||
| ptrace.h | ||
| registers.h | ||
| resource.h | ||
| scatterlist.h | ||
| sections.h | ||
| segment.h | ||
| sembuf.h | ||
| serial-regs.h | ||
| serial.h | ||
| setup.h | ||
| shmbuf.h | ||
| shmparam.h | ||
| sigcontext.h | ||
| siginfo.h | ||
| signal.h | ||
| smp.h | ||
| socket.h | ||
| sockios.h | ||
| spinlock.h | ||
| spr-regs.h | ||
| stat.h | ||
| statfs.h | ||
| string.h | ||
| swab.h | ||
| syscall.h | ||
| system.h | ||
| termbits.h | ||
| termios.h | ||
| thread_info.h | ||
| timer-regs.h | ||
| timex.h | ||
| tlb.h | ||
| tlbflush.h | ||
| topology.h | ||
| types.h | ||
| uaccess.h | ||
| ucontext.h | ||
| unaligned.h | ||
| unistd.h | ||
| user.h | ||
| vga.h | ||
| virtconvert.h | ||
| xor.h | ||