mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-11 13:27:06 +09:00
Merge tag 'v4.9.215' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
This is the 4.9.215 stable release
This commit is contained in:
@@ -1222,6 +1222,7 @@ struct pci_bits {
|
||||
};
|
||||
|
||||
extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);
|
||||
extern void ata_pci_shutdown_one(struct pci_dev *pdev);
|
||||
extern void ata_pci_remove_one(struct pci_dev *pdev);
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
@@ -71,10 +71,10 @@ static inline void hlist_nulls_add_head(struct hlist_nulls_node *n,
|
||||
struct hlist_nulls_node *first = h->first;
|
||||
|
||||
n->next = first;
|
||||
n->pprev = &h->first;
|
||||
WRITE_ONCE(n->pprev, &h->first);
|
||||
h->first = n;
|
||||
if (!is_a_nulls(first))
|
||||
first->pprev = &n->next;
|
||||
WRITE_ONCE(first->pprev, &n->next);
|
||||
}
|
||||
|
||||
static inline void __hlist_nulls_del(struct hlist_nulls_node *n)
|
||||
@@ -84,13 +84,13 @@ static inline void __hlist_nulls_del(struct hlist_nulls_node *n)
|
||||
|
||||
WRITE_ONCE(*pprev, next);
|
||||
if (!is_a_nulls(next))
|
||||
next->pprev = pprev;
|
||||
WRITE_ONCE(next->pprev, pprev);
|
||||
}
|
||||
|
||||
static inline void hlist_nulls_del(struct hlist_nulls_node *n)
|
||||
{
|
||||
__hlist_nulls_del(n);
|
||||
n->pprev = LIST_POISON2;
|
||||
WRITE_ONCE(n->pprev, LIST_POISON2);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -33,7 +33,7 @@ static inline void hlist_nulls_del_init_rcu(struct hlist_nulls_node *n)
|
||||
{
|
||||
if (!hlist_nulls_unhashed(n)) {
|
||||
__hlist_nulls_del(n);
|
||||
n->pprev = NULL;
|
||||
WRITE_ONCE(n->pprev, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ static inline void hlist_nulls_del_init_rcu(struct hlist_nulls_node *n)
|
||||
static inline void hlist_nulls_del_rcu(struct hlist_nulls_node *n)
|
||||
{
|
||||
__hlist_nulls_del(n);
|
||||
n->pprev = LIST_POISON2;
|
||||
WRITE_ONCE(n->pprev, LIST_POISON2);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -93,10 +93,10 @@ static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n,
|
||||
struct hlist_nulls_node *first = h->first;
|
||||
|
||||
n->next = first;
|
||||
n->pprev = &h->first;
|
||||
WRITE_ONCE(n->pprev, &h->first);
|
||||
rcu_assign_pointer(hlist_nulls_first_rcu(h), n);
|
||||
if (!is_a_nulls(first))
|
||||
first->pprev = &n->next;
|
||||
WRITE_ONCE(first->pprev, &n->next);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -268,7 +268,7 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev *__sd; \
|
||||
\
|
||||
__v4l2_device_call_subdevs_p(v4l2_dev, __sd, \
|
||||
!(grpid) || __sd->grp_id == (grpid), o, f , \
|
||||
(grpid) == 0 || __sd->grp_id == (grpid), o, f , \
|
||||
##args); \
|
||||
} while (0)
|
||||
|
||||
@@ -280,7 +280,7 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
|
||||
({ \
|
||||
struct v4l2_subdev *__sd; \
|
||||
__v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd, \
|
||||
!(grpid) || __sd->grp_id == (grpid), o, f , \
|
||||
(grpid) == 0 || __sd->grp_id == (grpid), o, f , \
|
||||
##args); \
|
||||
})
|
||||
|
||||
@@ -294,8 +294,8 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev *__sd; \
|
||||
\
|
||||
__v4l2_device_call_subdevs_p(v4l2_dev, __sd, \
|
||||
!(grpmsk) || (__sd->grp_id & (grpmsk)), o, f , \
|
||||
##args); \
|
||||
(grpmsk) == 0 || (__sd->grp_id & (grpmsk)), o, \
|
||||
f , ##args); \
|
||||
} while (0)
|
||||
|
||||
/*
|
||||
@@ -308,8 +308,8 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
|
||||
({ \
|
||||
struct v4l2_subdev *__sd; \
|
||||
__v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd, \
|
||||
!(grpmsk) || (__sd->grp_id & (grpmsk)), o, f , \
|
||||
##args); \
|
||||
(grpmsk) == 0 || (__sd->grp_id & (grpmsk)), o, \
|
||||
f , ##args); \
|
||||
})
|
||||
|
||||
/*
|
||||
|
||||
@@ -638,7 +638,6 @@ struct iscsi_reject {
|
||||
#define ISCSI_REASON_BOOKMARK_INVALID 9
|
||||
#define ISCSI_REASON_BOOKMARK_NO_RESOURCES 10
|
||||
#define ISCSI_REASON_NEGOTIATION_RESET 11
|
||||
#define ISCSI_REASON_WAITING_FOR_LOGOUT 12
|
||||
|
||||
/* Max. number of Key=Value pairs in a text message */
|
||||
#define MAX_KEY_VALUE_PAIRS 8192
|
||||
|
||||
@@ -92,9 +92,9 @@ struct snd_rawmidi_substream {
|
||||
struct list_head list; /* list of all substream for given stream */
|
||||
int stream; /* direction */
|
||||
int number; /* substream number */
|
||||
unsigned int opened: 1, /* open flag */
|
||||
append: 1, /* append flag (merge more streams) */
|
||||
active_sensing: 1; /* send active sensing when close */
|
||||
bool opened; /* open flag */
|
||||
bool append; /* append flag (merge more streams) */
|
||||
bool active_sensing; /* send active sensing when close */
|
||||
int use_count; /* use counter (for output) */
|
||||
size_t bytes;
|
||||
struct snd_rawmidi *rmidi;
|
||||
|
||||
Reference in New Issue
Block a user