mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-11 13:27:06 +09:00
Merge tag 'v4.9.165' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
This is the 4.9.165 stable release
This commit is contained in:
@@ -640,7 +640,7 @@ extern struct ratelimit_state dm_ratelimit_state;
|
||||
*/
|
||||
#define dm_target_offset(ti, sector) ((sector) - (ti)->begin)
|
||||
|
||||
static inline sector_t to_sector(unsigned long n)
|
||||
static inline sector_t to_sector(unsigned long long n)
|
||||
{
|
||||
return (n >> SECTOR_SHIFT);
|
||||
}
|
||||
|
||||
@@ -182,6 +182,7 @@ void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *);
|
||||
int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *);
|
||||
int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *);
|
||||
void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);
|
||||
void pipe_buf_mark_unmergeable(struct pipe_buffer *buf);
|
||||
|
||||
extern const struct pipe_buf_operations nosteal_pipe_buf_ops;
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ struct property_entry {
|
||||
#define PROPERTY_ENTRY_STRING(_name_, _val_) \
|
||||
(struct property_entry) { \
|
||||
.name = _name_, \
|
||||
.length = sizeof(_val_), \
|
||||
.length = sizeof(const char *), \
|
||||
.is_string = true, \
|
||||
{ .value = { .str = _val_ } }, \
|
||||
}
|
||||
|
||||
@@ -63,10 +63,11 @@ struct pnpipehdr {
|
||||
u8 state_after_reset; /* reset request */
|
||||
u8 error_code; /* any response */
|
||||
u8 pep_type; /* status indication */
|
||||
u8 data[1];
|
||||
u8 data0; /* anything else */
|
||||
};
|
||||
u8 data[];
|
||||
};
|
||||
#define other_pep_type data[1]
|
||||
#define other_pep_type data[0]
|
||||
|
||||
static inline struct pnpipehdr *pnp_hdr(struct sk_buff *skb)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user