diff options
| author | Linus Torvalds | 2014-01-05 07:10:45 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-01-05 07:10:45 +0100 |
| commit | d11739e6d83dc17a6b54cfa23f8d7872d9ef82e2 (patch) | |
| tree | ee147e777ada0f117fdd5ed13610b8628232bae4 /arch/arm/include/asm/io.h | |
| parent | Linux 3.13-rc7 (diff) | |
| parent | Revert "sparc64: Fix __copy_{to,from}_user_inatomic defines." (diff) | |
| download | kernel-qcow2-linux-d11739e6d83dc17a6b54cfa23f8d7872d9ef82e2.tar.gz kernel-qcow2-linux-d11739e6d83dc17a6b54cfa23f8d7872d9ef82e2.tar.xz kernel-qcow2-linux-d11739e6d83dc17a6b54cfa23f8d7872d9ef82e2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc bugfixes from David Miller:
1) Missing include can lead to build failure, from Kirill Tkhai.
2) Use dev_is_pci() where applicable, from Yijing Wang.
3) Enable irqs after we enable preemption in cpu startup path, from
Kirill Tkhai.
4) Revert a __copy_{to,from}_user_inatomic change that broke
iov_iter_copy_from_user_atomic() and thus several tests in xfstests
and LTP. From Dave Kleikamp.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
Revert "sparc64: Fix __copy_{to,from}_user_inatomic defines."
sparc64: smp_callin: Enable irqs after preemption is disabled
sparc/PCI: Use dev_is_pci() to identify PCI devices
sparc64: Fix build regression
Diffstat (limited to 'arch/arm/include/asm/io.h')
0 files changed, 0 insertions, 0 deletions