aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-29 12:54:31 +0100
committerMark Brown <broonie@linaro.org>2013-07-29 12:54:31 +0100
commit3b08c7740bb1e0ef69c71c7232a870ca250a9e21 (patch)
treefdf5bb7fe446f142ffd02cd4013721e75c9d880c /include/linux
parent04e780d9cc5d55b07286a5ecbc455c027a81ab7f (diff)
parent6f7bb6bafb3153e9b9383f3f44a0f23fc00318d9 (diff)
downloadvexpress-lsk-3b08c7740bb1e0ef69c71c7232a870ca250a9e21.tar.gz
Merge tag 'v3.10.4' into linux-linaro-lsk
This is the 3.10.4 stable release
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/edac.h7
-rw-r--r--include/linux/if_vlan.h3
-rw-r--r--include/linux/virtio.h4
3 files changed, 11 insertions, 3 deletions
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 0b763276f61..5c6d7fbaf89 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -622,7 +622,7 @@ struct edac_raw_error_desc {
*/
struct mem_ctl_info {
struct device dev;
- struct bus_type bus;
+ struct bus_type *bus;
struct list_head link; /* for global list of mem_ctl_info structs */
@@ -742,4 +742,9 @@ struct mem_ctl_info {
#endif
};
+/*
+ * Maximum number of memory controllers in the coherent fabric.
+ */
+#define EDAC_MAX_MCS 16
+
#endif
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 637fa71de0c..0b3498800ba 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -79,9 +79,8 @@ static inline int is_vlan_dev(struct net_device *dev)
}
#define vlan_tx_tag_present(__skb) ((__skb)->vlan_tci & VLAN_TAG_PRESENT)
-#define vlan_tx_nonzero_tag_present(__skb) \
- (vlan_tx_tag_present(__skb) && ((__skb)->vlan_tci & VLAN_VID_MASK))
#define vlan_tx_tag_get(__skb) ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)
+#define vlan_tx_tag_get_id(__skb) ((__skb)->vlan_tci & VLAN_VID_MASK)
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 9ff8645b7e0..72398eea6e8 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -70,6 +70,10 @@ void virtqueue_disable_cb(struct virtqueue *vq);
bool virtqueue_enable_cb(struct virtqueue *vq);
+unsigned virtqueue_enable_cb_prepare(struct virtqueue *vq);
+
+bool virtqueue_poll(struct virtqueue *vq, unsigned);
+
bool virtqueue_enable_cb_delayed(struct virtqueue *vq);
void *virtqueue_detach_unused_buf(struct virtqueue *vq);