diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-15 18:13:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-15 18:13:41 -0800 |
| commit | ed3c5a0be38c180ab0899a0f52719e81f36b87a1 (patch) | |
| tree | 684eb66d1e8513b4584c680e157f3887c04c58ba /fs | |
| parent | 66d466722c39f663b2bbeb44ba4f9419a548fa23 (diff) | |
| parent | 6bdf1e0efb04a1716373646cb6f35b73addca492 (diff) | |
| download | linux-ed3c5a0be38c180ab0899a0f52719e81f36b87a1.tar.bz2 | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
"virtio, vhost: new device, fixes, speedups
This includes the new virtio crypto device, and fixes all over the
place. In particular enabling endian-ness checks for sparse builds
found some bugs which this fixes. And it appears that everyone is in
agreement that disabling endian-ness sparse checks shouldn't be
necessary any longer.
So this enables them for everyone, and drops the __CHECK_ENDIAN__ and
__bitwise__ APIs.
IRQ handling in virtio has been refactored somewhat, the larger switch
to IRQ_SHARED will have to wait as it proved too aggressive"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (34 commits)
Makefile: drop -D__CHECK_ENDIAN__ from cflags
fs/logfs: drop __CHECK_ENDIAN__
Documentation/sparse: drop __CHECK_ENDIAN__
linux: drop __bitwise__ everywhere
checkpatch: replace __bitwise__ with __bitwise
Documentation/sparse: drop __bitwise__
tools: enable endian checks for all sparse builds
linux/types.h: enable endian checks for all sparse builds
virtio_mmio: Set dev.release() to avoid warning
vhost: remove unused feature bit
virtio_ring: fix description of virtqueue_get_buf
vhost/scsi: Remove unused but set variable
tools/virtio: use {READ,WRITE}_ONCE() in uaccess.h
vringh: kill off ACCESS_ONCE()
tools/virtio: fix READ_ONCE()
crypto: add virtio-crypto driver
vhost: cache used event for better performance
vsock: lookup and setup guest_cid inside vhost_vsock_lock
virtio_pci: split vp_try_to_find_vqs into INTx and MSI-X variants
virtio_pci: merge vp_free_vectors into vp_del_vqs
...
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/logfs/logfs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index 27d040e35faa..11209eefbe59 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h @@ -10,9 +10,7 @@ #ifndef FS_LOGFS_LOGFS_H #define FS_LOGFS_LOGFS_H -#undef __CHECK_ENDIAN__ -#define __CHECK_ENDIAN__ - +#include <linux/types.h> #include <linux/btree.h> #include <linux/crc32.h> #include <linux/fs.h> |