You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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() ...		13 years ago
..
Kconfig	ARM: 7323/1: Do not allow ARM_LPAE on pre-ARMv7 architectures	13 years ago
Makefile	ARM: v6k: introduce CPU_V6K option	14 years ago
abort-ev4.S	ARM: entry: data abort: tail-call the main data abort handler	14 years ago
abort-ev4t.S	ARM: entry: data abort: tail-call the main data abort handler	14 years ago
abort-ev5t.S	ARM: entry: data abort: tail-call the main data abort handler	14 years ago
abort-ev5tj.S	ARM: entry: data abort: tail-call the main data abort handler	14 years ago
abort-ev6.S	ARM: entry: data abort: tail-call the main data abort handler	14 years ago
abort-ev7.S	ARM: entry: data abort: tail-call the main data abort handler	14 years ago
abort-lv4t.S	ARM: entry: data abort: ensure r5 is preserved by abort functions	14 years ago
abort-macro.S	ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort	14 years ago
abort-nommu.S	ARM: entry: data abort: tail-call the main data abort handler	14 years ago
alignment.c	ARM: LPAE: Add fault handling support	13 years ago
cache-fa.S	ARM: mm: cache-fa: Use the new processor struct macros	14 years ago
cache-feroceon-l2.c	ARM: fix cache-feroceon-l2 after stack based kmap_atomic()	14 years ago
cache-l2x0.c	ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds	13 years ago
cache-tauros2.c	…
cache-v3.S	ARM: mm: cache-v3: Use the new processor struct macros	14 years ago
cache-v4.S	ARM: mm: cache-v4: Use the new processor struct macros	14 years ago
cache-v4wb.S	ARM: mm: cache-v4wb: Use the new processor struct macros	14 years ago
cache-v4wt.S	ARM: mm: cache-v4wt: Use the new processor struct macros	14 years ago
cache-v6.S	ARM: mm: cache-v6: Use the new processor struct macros	14 years ago
cache-v7.S	ARM: 7325/1: fix v7 boot with lockdep enabled	13 years ago
cache-xsc3l2.c	ARM: fix cache-xsc3l2 after stack based kmap_atomic()	14 years ago
context.c	ARM: LPAE: Add context switching support	13 years ago
copypage-fa.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-feroceon.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-v3.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-v4mc.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-v4wb.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-v4wt.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-v6.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-xsc3.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
copypage-xscale.c	arm: remove the second argument of k[un]map_atomic()	13 years ago
dma-mapping.c	ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocations	13 years ago
extable.c	…
fault-armv.c	arm: remove several unnecessary module.h include instances	13 years ago
fault.c	Merge branch 'devel-stable' into for-linus	13 years ago
fault.h	ARM: LPAE: Add fault handling support	13 years ago
flush.c	Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus	14 years ago
fsr-2level.c	ARM: LPAE: Move the FSR definitions to separate files	13 years ago
fsr-3level.c	ARM: LPAE: Add fault handling support	13 years ago
highmem.c	highmem: kill all __kmap_atomic()	13 years ago
idmap.c	ARM: LPAE: Add identity mapping support for the 3-level page table format	13 years ago
init.c	ARM: Remove duplicate asm/memblock.h include from arch/arm/mm/init.c	13 years ago
iomap.c	arm: switch to GENERIC_PCI_IOMAP	13 years ago
ioremap.c	Revert "ARM: 7304/1: ioremap: fix boundary check when reusing static mapping"	13 years ago
mm.h	ARM: add generic ioremap optimization by reusing static mappings	13 years ago
mmap.c	ARM: 7169/1: topdown mmap support	13 years ago
mmu.c	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable	13 years ago
nommu.c	Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable	13 years ago
pabort-legacy.S	ARM: entry: prefetch abort: tail-call the main prefetch abort handler	14 years ago
pabort-v6.S	ARM: entry: prefetch abort: tail-call the main prefetch abort handler	14 years ago
pabort-v7.S	ARM: entry: prefetch abort: tail-call the main prefetch abort handler	14 years ago
pgd.c	ARM: LPAE: Page table maintenance for the 3-level format	13 years ago
proc-arm6_7.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm7tdmi.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm9tdmi.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm720.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm740.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm920.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm922.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm925.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm926.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm940.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm946.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm1020.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm1020e.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm1022.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-arm1026.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-fa526.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-feroceon.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-macros.S	ARM: LPAE: MMU setup for the 3-level page table format	13 years ago
proc-mohawk.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-sa110.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-sa1100.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-syms.c	ARM: add size argument to __cpuc_flush_dcache_page	15 years ago
proc-v6.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-v7-2level.S	ARM: LPAE: Factor out classic-MMU specific code into proc-v7-2level.S	13 years ago
proc-v7-3level.S	ARM: LPAE: MMU setup for the 3-level page table format	13 years ago
proc-v7.S	ARM: 7345/1: errata: update workaround for A9 erratum #743622	13 years ago
proc-xsc3.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
proc-xscale.S	ARM: proc-*.S: place cpu_reset functions into .idmap.text section	13 years ago
tlb-fa.S	Merge branch 'devel-stable' into for-next	14 years ago
tlb-v3.S	ARM: mm: tlb-v3: Use the new processor struct macros	14 years ago
tlb-v4.S	ARM: mm: tlb-v4: Use the new processor struct macros	14 years ago
tlb-v4wb.S	ARM: mm: tlb-v4wb: Use the new processor struct macros	14 years ago
tlb-v4wbi.S	ARM: mm: tlb-v4wbi: Use the new processor struct macros	14 years ago
tlb-v6.S	Merge branch 'devel-stable' into for-next	14 years ago
tlb-v7.S	Merge branch 'devel-stable' into for-next	14 years ago
vmregion.c	ARM: DMA: top-down allocation in DMA coherent region	14 years ago
vmregion.h	ARM: DMA coherent allocator: align remapped addresses	15 years ago