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 58bca4a8fa Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping ... Pull DMA mapping branch from Marek Szyprowski: "Short summary for the whole series: A few limitations have been identified in the current dma-mapping design and its implementations for various architectures. There exist more than one function for allocating and freeing the buffers: currently these 3 are used dma_{alloc, free}_coherent, dma_{alloc,free}_writecombine, dma_{alloc,free}_noncoherent. For most of the systems these calls are almost equivalent and can be interchanged. For others, especially the truly non-coherent ones (like ARM), the difference can be easily noticed in overall driver performance. Sadly not all architectures provide implementations for all of them, so the drivers might need to be adapted and cannot be easily shared between different architectures. The provided patches unify all these functions and hide the differences under the already existing dma attributes concept. The thread with more references is available here: http://www.spinics.net/lists/linux-sh/msg09777.html These patches are also a prerequisite for unifying DMA-mapping implementation on ARM architecture with the common one provided by dma_map_ops structure and extending it with IOMMU support. More information is available in the following thread: http://thread.gmane.org/gmane.linux.kernel.cross-arch/12819 More works on dma-mapping framework are planned, especially in the area of buffer sharing and managing the shared mappings (together with the recently introduced dma_buf interface: commit d15bd7ee44 "dma-buf: Introduce dma buffer sharing mechanism"). The patches in the current set introduce a new alloc/free methods (with support for memory attributes) in dma_map_ops structure, which will later replace dma_alloc_coherent and dma_alloc_writecombine functions." People finally started piping up with support for merging this, so I'm merging it as the last of the pending stuff from the merge window. Looks like pohmelfs is going to wait for 3.5 and more external support for merging. * 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: common: DMA-mapping: add NON-CONSISTENT attribute common: DMA-mapping: add WRITE_COMBINE attribute common: dma-mapping: introduce mmap method common: dma-mapping: remove old alloc_coherent and free_coherent methods Hexagon: adapt for dma_map_ops changes Unicore32: adapt for dma_map_ops changes Microblaze: adapt for dma_map_ops changes SH: adapt for dma_map_ops changes Alpha: adapt for dma_map_ops changes SPARC: adapt for dma_map_ops changes PowerPC: adapt for dma_map_ops changes MIPS: adapt for dma_map_ops changes X86 & IA64: adapt for dma_map_ops changes common: dma-mapping: introduce generic alloc() and free() methods		13 years ago
..
dec	Fix common misspellings	14 years ago
emma	MIPS: EMMA2RH: Replace EMMA2RH_SW_IRQ_INTxx with EMMA2RH_SW_IRQ(n)	15 years ago
fw	…
ip32	net: meth: Add set_rx_mode hook to fix ICMPv6 neighbor discovery	13 years ago
lasat	doc: fix broken references	14 years ago
mach-ar7	MIPS: AR7: Fix loops per jiffies on TNETD7200 devices	14 years ago
mach-ath79	MIPS: ath79: Add AR933x specific WMAC setup code	13 years ago
mach-au1x00	Disintegrate asm/system.h for MIPS	13 years ago
mach-bcm47xx	MIPS: BCM47XX: move and extend sprom parsing	13 years ago
mach-bcm63xx	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	13 years ago
mach-cavium-octeon	MIPS: Octeon: Enable C0_UserLocal probing.	14 years ago
mach-cobalt	…
mach-db1x00	MIPS: Alchemy: remove unused board headers	13 years ago
mach-dec	…
mach-emma2rh	…
mach-generic	MIPS: irq: Remove IRQF_DISABLED	13 years ago
mach-ip22	…
mach-ip27	MIPS: Remove pointless return statement from empty void functions.	14 years ago
mach-ip28	…
mach-ip32	Fix common misspellings	14 years ago
mach-jazz	MIPS: irq: Remove IRQF_DISABLED	13 years ago
mach-jz4740	MIPS: static should be at beginning of declaration	14 years ago
mach-lantiq	MIPS: Lantiq: Add ethernet driver	14 years ago
mach-lasat	…
mach-loongson	MIPS: Remove pointless return statement from empty void functions.	14 years ago
mach-malta	MIPS: Enable cpu_has_clo_clz for MIPS Technologies' platforms	14 years ago
mach-mipssim	MIPS: Enable cpu_has_clo_clz for MIPS Technologies' platforms	14 years ago
mach-netlogic	MIPS: Netlogic: XLP CPU support.	13 years ago
mach-pnx833x	MIPS: Nuke trailing blank lines	15 years ago
mach-pnx8550	…
mach-powertv	MIPS: Remove unneeded version.h includes from arch/mips/	14 years ago
mach-rc32434	…
mach-rm	…
mach-sibyte	MIPS: Sibyte: Apply M3 workaround only on affected chip types and versions.	15 years ago
mach-tx39xx	MIPS: Move FIXADDR_TOP into spaces.h	14 years ago
mach-tx49xx	MIPS: Move FIXADDR_TOP into spaces.h	14 years ago
mach-vr41xx	…
mach-wrppmc	…
mach-yosemite	…
mips-boards	MIPS: GIC: Remove dependencies from Malta files.	15 years ago
netlogic	MIPS: Netlogic: Merge some of XLR/XLP wakup code	13 years ago
octeon	MIPS: Octeon: Update DMA mapping operations for OCTEON II processors.	13 years ago
pci	Fix common misspellings	14 years ago
pmc-sierra/msp71xx	Fix common misspellings	14 years ago
sgi	Fix common misspellings	14 years ago
sibyte	Fix common misspellings	14 years ago
sn	Fix common misspellings	14 years ago
txx9	Disintegrate asm/system.h for MIPS	13 years ago
vr41xx	…
xtalk	…
Kbuild	UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines	13 years ago
abi.h	MIPS: Move signal trampolines off of the stack.	15 years ago
addrspace.h	…
amon.h	…
arch_hweight.h	MIPS: Create and use asm/arch_hweight.h	15 years ago
asm-offsets.h	…
asm.h	…
asmmacro-32.h	update David Miller's old email address	14 years ago
asmmacro-64.h	update David Miller's old email address	14 years ago
asmmacro.h	…
atomic.h	Disintegrate asm/system.h for MIPS	13 years ago
auxvec.h	…
barrier.h	Disintegrate asm/system.h for MIPS	13 years ago
bcache.h	…
bitops.h	bitops: remove minix bitops from asm/bitops.h	14 years ago
bitsperlong.h	…
bmips.h	MIPS: BMIPS: Introduce bmips.h	13 years ago
bootinfo.h	MIPS: Handle initmem in systems with kernel not in add_memory_region() mem	13 years ago
branch.h	MIPS Kprobes: Refactor branch emulation	13 years ago
break.h	MIPS: kprobe: Add support.	15 years ago
bug.h	…
bugs.h	…
byteorder.h	…
cache.h	MIPS: Rename .data..mostly and properly handle it in linker script	14 years ago
cachectl.h	…
cacheflush.h	MIPS: cache: Provide cache flush operations for XFS	13 years ago
cacheops.h	MIPS: RM7000: Add support for tertiary cache	15 years ago
cevt-r4k.h	MIPS: MSP: Fix build error	14 years ago
checksum.h	…
clock.h	…
cmp.h	…
cmpxchg.h	Disintegrate asm/system.h for MIPS	13 years ago
compat-signal.h	…
compat.h	compat: sync compat_stats with statfs.	13 years ago
compiler.h	…
cop2.h	MIPS: Don't place cu2 notifiers in __cpuinitdata	15 years ago
cpu-features.h	MIPS: Update comment for cpu_has_clo_clz	15 years ago
cpu-info.h	MIPS: Probe for presence of KScratch registers.	14 years ago
cpu.h	Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next	13 years ago
cputime.h	…
current.h	MIPS: Use generic current.h	15 years ago
debug.h	…
delay.h	…
device.h	MIPS: Convert DMA to use dma-mapping-common.h	14 years ago
div64.h	…
dma-mapping.h	MIPS: adapt for dma_map_ops changes	13 years ago
dma.h	Disintegrate asm/system.h for MIPS	13 years ago
ds1287.h	…
dsp.h	…
edac.h	…
elf.h	MIPS: Don't clobber personality high bits.	14 years ago
emergency-restart.h	…
errno.h	mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally	14 years ago
exec.h	Disintegrate asm/system.h for MIPS	13 years ago
fb.h	…
fcntl.h	MIPS: 32-bit: Fix build failure in asm/fcntl.h	15 years ago
fixmap.h	MIPS: Move FIXADDR_TOP into spaces.h	14 years ago
floppy.h	treewide: fix potentially dangerous trailing ';' in #defined values/expressions	14 years ago
fpregdef.h	…
fpu.h	…
fpu_emulator.h	MIPS: Fix build breakage if CONFIG_DEBUG_FS is enabled.	15 years ago
ftrace.h	MIPS: Loongson: Change the Email address of Wu Zhangjin	15 years ago
futex.h	futex: Sanitize futex ops argument types	14 years ago
gcmpregs.h	…
gic.h	MIPS: GIC: Remove dependencies from Malta files.	15 years ago
gio_device.h	MIPS: GIO bus support for SGI IP22/28	13 years ago
gpio.h	…
gt64120.h	MIPS: GT64120: Remove useless inclusion of clocksource.h.	14 years ago
hardirq.h	…
hazards.h	MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS	13 years ago
highmem.h	highmem: kill all __kmap_atomic()	13 years ago
hugetlb.h	MIPS: Hugetlb: Keep TLB cache hot while flushing	13 years ago
hw_irq.h	atomic: use <linux/atomic.h>	14 years ago
i8259.h	MIPS: i8259: Convert IRQ controller lock to raw spinlock.	15 years ago
ide.h	…
inst.h	MIPS: Add LDX and LWX instructions to uasm.	14 years ago
io.h	Revert "MIPS: LD/SD o32 macro GAS fix update"	13 years ago
ioctl.h	…
ioctls.h	tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys	14 years ago
ipcbuf.h	consolidate a bunch of ipcbuf.h instances	13 years ago
irq.h	irq_domain/mips: Allow irq_domain on MIPS	13 years ago
irq_cpu.h	…
irq_gt641xx.h	…
irq_regs.h	…
irqflags.h	Fix common misspellings	14 years ago
isadep.h	…
jazz.h	…
jazzdma.h	…
jump_label.h	static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()	13 years ago
kdebug.h	MIPS: kprobe: Add support.	15 years ago
kexec.h	…
kgdb.h	kgdb,mips: Individual register get/set for mips	15 years ago
kmap_types.h	…
kprobes.h	MIPS Kprobes: Support branch instructions probing	13 years ago
kspd.h	…
linkage.h	…
local.h	atomic: use <linux/atomic.h>	14 years ago
local64.h	arch: Implement local64_t	15 years ago
m48t37.h	…
mc146818-time.h	set_rtc_mmss: show warning message only once	14 years ago
mc146818rtc.h	…
mips_machine.h	MIPS: Add generic support for multiple machines within a single kernel	14 years ago
mips_mt.h	…
mipsmtregs.h	…
mipsprom.h	MIPS: SNI: Fix conflicting wrapper symbols for headers.	13 years ago
mipsregs.h	MIPS: BMIPS: Add set/clear CP0 macros for BMIPS operations	13 years ago
mman.h	coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP	13 years ago
mmu.h	MIPS: Preliminary VDSO	15 years ago
mmu_context.h	MIPS: Use C0_KScratch (if present) to hold PGD pointer.	14 years ago
mmzone.h	…
module.h	Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next	13 years ago
msc01_ic.h	MIPS: Nuke trailing blank lines	15 years ago
msgbuf.h	…
mutex.h	…
nile4.h	MIPS: Nuke trailing blank lines	15 years ago
paccess.h	Fix common misspellings	14 years ago
page.h	MIPS: Remove temporary kludge from <asm/page.h>	13 years ago
param.h	…
parport.h	MIPS: Use generic parport.h	15 years ago
pci.h	PCI: collapse pcibios_resource_to_bus	13 years ago
percpu.h	…
perf_event.h	MIPS, Perf-events: Work with irq_work	14 years ago
pgalloc.h	…
pgtable-32.h	Merge branch 'next/generic' into mips-for-linux-next	13 years ago
pgtable-64.h	MIPS: Make TASK_SIZE reflect proper size for both 32 and 64 bit processes.	14 years ago
pgtable-bits.h	MIPS: Implement Read Inhibit/eXecute Inhibit	15 years ago
pgtable.h	MIPS: topdown mmap support	14 years ago
pmon.h	…
poll.h	…
posix_types.h	mips: Use generic posix_types.h	13 years ago
prefetch.h	…
processor.h	Disintegrate asm/system.h for MIPS	13 years ago
prom.h	MIPS: SNI: Fix conflicting wrapper symbols for headers.	13 years ago
ptrace.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit	13 years ago
r4k-timer.h	…
r4kcache.h	update David Miller's old email address	14 years ago
reboot.h	…
reg.h	…
regdef.h	MIPS: O32: Provide definition of registers ta0 .. ta3.	13 years ago
resource.h	…
rm9k-ocd.h	…
rtlx.h	…
scatterlist.h	remove needless ISA_DMA_THRESHOLD	15 years ago
seccomp.h	…
sections.h	…
segment.h	…
sembuf.h	…
serial.h	MIPS: Use generic serial.h	15 years ago
setup.h	Disintegrate asm/system.h for MIPS	13 years ago
sgialib.h	update David Miller's old email address	14 years ago
sgiarcs.h	update David Miller's old email address	14 years ago
sgidefs.h	…
shmbuf.h	…
shmparam.h	…
sigcontext.h	…
siginfo.h	Fix common misspellings	14 years ago
signal.h	…
sim.h	…
smp-ops.h	MIPS: ARC: Fix build of firmware library on uniprocessor.	14 years ago
smp.h	atomic: use <linux/atomic.h>	14 years ago
smtc.h	MIPS: SMTC: Fix build.	14 years ago
smtc_ipi.h	…
smtc_proc.h	…
smvp.h	…
sni.h	…
socket.h	net: Add framework to allow sending packets with customized CRC.	13 years ago
sockios.h	…
sparsemem.h	MIPS: Nuke trailing blank lines	15 years ago
spinlock.h	MIPS: Microoptimize arch_{read,write}_lock	14 years ago
spinlock_types.h	MIPS: Optimize spinlocks.	15 years ago
spram.h	…
stackframe.h	MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTC	14 years ago
stacktrace.h	MIPS: Add new unwind_stack variant	14 years ago
stat.h	…
statfs.h	add f_flags to struct statfs(64)	15 years ago
string.h	…
suspend.h	PM / Hibernate: Remove arch_prepare_suspend()	14 years ago
swab.h	…
switch_to.h	Disintegrate asm/system.h for MIPS	13 years ago
sysmips.h	…
termbits.h	tty: Add EXTPROC support for LINEMODE	15 years ago
termios.h	…
thread_info.h	freezer: remove now unused TIF_FREEZE	13 years ago
time.h	mips: convert to clocksource_register_hz/khz	14 years ago
timex.h	…
titan_dep.h	…
tlb.h	…
tlbdebug.h	…
tlbflush.h	…
tlbmisc.h	MIPS: Fix Jazz 64-bit build error.	13 years ago
topology.h	…
traps.h	MIPS: Add board_ebase_setup()	13 years ago
txx9irq.h	…
txx9pio.h	…
txx9tmr.h	…
types.h	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	13 years ago
uaccess.h	MIPS: Make TASK_SIZE reflect proper size for both 32 and 64 bit processes.	14 years ago
uasm.h	MIPS: Add uasm UASM_i_SRL_SAFE macro.	14 years ago
ucontext.h	MIPS: Use generic ucontext.h	15 years ago
unaligned.h	…
unistd.h	MIPS: Hook up process_vm_readv and process_vm_writev system calls.	13 years ago
user.h	…
vdso.h	MIPS: Preliminary VDSO	15 years ago
vga.h	…
vpe.h	…
war.h	Fix common misspellings	14 years ago
watch.h	…
wbflush.h	…
xor.h	…