History

Merge 5.5-rc7 into staging-next

We want the staging fixes in here as well

Greg Kroah-Hartman committed 6 years ago

Commit c318f072 parents 7b2d7fa def9d27291 files · +2319 −2230Browse files

Showing the changes to include/linux (7 of 291 files). Show all

Unified · Split

7 files
  1. include/linux/blkdev.h +4 −4
  2. include/linux/mm.h +15 −3
  3. include/linux/mmzone.h +2 −3
  4. include/linux/namei.h +0 −1
  5. include/linux/sched.h +2 −2
  6. include/linux/skmsg.h +9 −4
  7. include/linux/tnum.h +1 −1
include/linux/blkdev.h+4−4
@@ -328,6 +328,7 @@ struct queue_limits { · 327 unmodified lines
328 unsigned int max_sectors;328 unsigned int max_sectors;
329 unsigned int max_segment_size;329 unsigned int max_segment_size;
330 unsigned int physical_block_size;330 unsigned int physical_block_size;
331 unsigned int logical_block_size;
331 unsigned int alignment_offset;332 unsigned int alignment_offset;
332 unsigned int io_min;333 unsigned int io_min;
333 unsigned int io_opt;334 unsigned int io_opt;
@@ -338,7 +339,6 @@ struct queue_limits { · 4 unmodified lines
338 unsigned int discard_granularity;339 unsigned int discard_granularity;
339 unsigned int discard_alignment;340 unsigned int discard_alignment;
340 341
341 unsigned short logical_block_size;
342 unsigned short max_segments;342 unsigned short max_segments;
343 unsigned short max_integrity_segments;343 unsigned short max_integrity_segments;
344 unsigned short max_discard_segments;344 unsigned short max_discard_segments;
@@ -1077,7 +1077,7 @@ extern void blk_queue_max_write_same_sectors(struct request_queue *q, · 732 unmodified lines
1077 unsigned int max_write_same_sectors);1077 unsigned int max_write_same_sectors);
1078extern void blk_queue_max_write_zeroes_sectors(struct request_queue *q,1078extern void blk_queue_max_write_zeroes_sectors(struct request_queue *q,
1079 unsigned int max_write_same_sectors);1079 unsigned int max_write_same_sectors);
1080extern void blk_queue_logical_block_size(struct request_queue *, unsigned short);1080extern void blk_queue_logical_block_size(struct request_queue *, unsigned int);
1081extern void blk_queue_physical_block_size(struct request_queue *, unsigned int);1081extern void blk_queue_physical_block_size(struct request_queue *, unsigned int);
1082extern void blk_queue_alignment_offset(struct request_queue *q,1082extern void blk_queue_alignment_offset(struct request_queue *q,
1083 unsigned int alignment);1083 unsigned int alignment);
@@ -1291,7 +1291,7 @@ static inline unsigned int queue_max_segment_size(const struct request_queue *q) · 207 unmodified lines
1291 return q->limits.max_segment_size;1291 return q->limits.max_segment_size;
1292}1292}
1293 1293
1294static inline unsigned short queue_logical_block_size(const struct request_queue *q)1294static inline unsigned queue_logical_block_size(const struct request_queue *q)
1295{1295{
1296 int retval = 512;1296 int retval = 512;
1297 1297
@@ -1301,7 +1301,7 @@ static inline unsigned short queue_logical_block_size(const struct request_queue · 3 unmodified lines
1301 return retval;1301 return retval;
1302}1302}
1303 1303
1304static inline unsigned short bdev_logical_block_size(struct block_device *bdev)1304static inline unsigned int bdev_logical_block_size(struct block_device *bdev)
1305{1305{
1306 return queue_logical_block_size(bdev_get_queue(bdev));1306 return queue_logical_block_size(bdev_get_queue(bdev));
1307}1307}
include/linux/mm.h+15−3
@@ -2658,13 +2658,25 @@ static inline bool want_init_on_free(void) · 2657 unmodified lines
2658 !page_poisoning_enabled();2658 !page_poisoning_enabled();
2659}2659}
2660 2660
2661#ifdef CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT2661#ifdef CONFIG_DEBUG_PAGEALLOC
2662DECLARE_STATIC_KEY_TRUE(_debug_pagealloc_enabled);2662extern void init_debug_pagealloc(void);
2663#else2663#else
2664DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled);2664static inline void init_debug_pagealloc(void) {}
2665#endif2665#endif
2666extern bool _debug_pagealloc_enabled_early;
2667DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled);
2666 2668
2667static inline bool debug_pagealloc_enabled(void)2669static inline bool debug_pagealloc_enabled(void)
2670{
2671 return IS_ENABLED(CONFIG_DEBUG_PAGEALLOC) &&
2672 _debug_pagealloc_enabled_early;
2673}
2674
2675/*
2676 * For use in fast paths after init_debug_pagealloc() has run, or when a
2677 * false negative result is not harmful when called too early.
2678 */
2679static inline bool debug_pagealloc_enabled_static(void)
2668{2680{
2669 if (!IS_ENABLED(CONFIG_DEBUG_PAGEALLOC))2681 if (!IS_ENABLED(CONFIG_DEBUG_PAGEALLOC))
2670 return false;2682 return false;
include/linux/mmzone.h+2−3
@@ -215,9 +215,8 @@ enum node_stat_item { · 214 unmodified lines
215 NR_INACTIVE_FILE, /* " " " " " */215 NR_INACTIVE_FILE, /* " " " " " */
216 NR_ACTIVE_FILE, /* " " " " " */216 NR_ACTIVE_FILE, /* " " " " " */
217 NR_UNEVICTABLE, /* " " " " " */217 NR_UNEVICTABLE, /* " " " " " */
218 NR_SLAB_RECLAIMABLE, /* Please do not reorder this item */218 NR_SLAB_RECLAIMABLE,
219 NR_SLAB_UNRECLAIMABLE, /* and this one without looking at219 NR_SLAB_UNRECLAIMABLE,
220 * memcg_flush_percpu_vmstats() first. */
221 NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */220 NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */
222 NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */221 NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */
223 WORKINGSET_NODES,222 WORKINGSET_NODES,
include/linux/namei.h+0−1
@@ -34,7 +34,6 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; · 33 unmodified lines
34 34
35/* internal use only */35/* internal use only */
36#define LOOKUP_PARENT 0x001036#define LOOKUP_PARENT 0x0010
37#define LOOKUP_NO_REVAL 0x0080
38#define LOOKUP_JUMPED 0x100037#define LOOKUP_JUMPED 0x1000
39#define LOOKUP_ROOT 0x200038#define LOOKUP_ROOT 0x2000
40#define LOOKUP_ROOT_GRABBED 0x000839#define LOOKUP_ROOT_GRABBED 0x0008
include/linux/sched.h+2−2
@@ -1929,11 +1929,11 @@ static inline void rseq_migrate(struct task_struct *t) · 1928 unmodified lines
1929 1929
1930/*1930/*
1931 * If parent process has a registered restartable sequences area, the1931 * If parent process has a registered restartable sequences area, the
1932 * child inherits. Only applies when forking a process, not a thread.1932 * child inherits. Unregister rseq for a clone with CLONE_VM set.
1933 */1933 */
1934static inline void rseq_fork(struct task_struct *t, unsigned long clone_flags)1934static inline void rseq_fork(struct task_struct *t, unsigned long clone_flags)
1935{1935{
1936 if (clone_flags & CLONE_THREAD) {1936 if (clone_flags & CLONE_VM) {
1937 t->rseq = NULL;1937 t->rseq = NULL;
1938 t->rseq_sig = 0;1938 t->rseq_sig = 0;
1939 t->rseq_event_mask = 0;1939 t->rseq_event_mask = 0;
include/linux/skmsg.h+9−4
@@ -358,17 +358,22 @@ static inline void sk_psock_update_proto(struct sock *sk, · 357 unmodified lines
358static inline void sk_psock_restore_proto(struct sock *sk,358static inline void sk_psock_restore_proto(struct sock *sk,
359 struct sk_psock *psock)359 struct sk_psock *psock)
360{360{
361 sk->sk_write_space = psock->saved_write_space;361 sk->sk_prot->unhash = psock->saved_unhash;
362 362
363 if (psock->sk_proto) {363 if (psock->sk_proto) {
364 struct inet_connection_sock *icsk = inet_csk(sk);364 struct inet_connection_sock *icsk = inet_csk(sk);
365 bool has_ulp = !!icsk->icsk_ulp_data;365 bool has_ulp = !!icsk->icsk_ulp_data;
366 366
367 if (has_ulp)367 if (has_ulp) {
368 tcp_update_ulp(sk, psock->sk_proto);368 tcp_update_ulp(sk, psock->sk_proto,
369 else369 psock->saved_write_space);
370 } else {
370 sk->sk_prot = psock->sk_proto;371 sk->sk_prot = psock->sk_proto;
372 sk->sk_write_space = psock->saved_write_space;
373 }
371 psock->sk_proto = NULL;374 psock->sk_proto = NULL;
375 } else {
376 sk->sk_write_space = psock->saved_write_space;
372 }377 }
373}378}
374 379
include/linux/tnum.h+1−1
@@ -30,7 +30,7 @@ struct tnum tnum_lshift(struct tnum a, u8 shift); · 29 unmodified lines
30/* Shift (rsh) a tnum right (by a fixed shift) */30/* Shift (rsh) a tnum right (by a fixed shift) */
31struct tnum tnum_rshift(struct tnum a, u8 shift);31struct tnum tnum_rshift(struct tnum a, u8 shift);
32/* Shift (arsh) a tnum right (by a fixed min_shift) */32/* Shift (arsh) a tnum right (by a fixed min_shift) */
33struct tnum tnum_arshift(struct tnum a, u8 min_shift);33struct tnum tnum_arshift(struct tnum a, u8 min_shift, u8 insn_bitness);
34/* Add two tnums, return @a + @b */34/* Add two tnums, return @a + @b */
35struct tnum tnum_add(struct tnum a, struct tnum b);35struct tnum tnum_add(struct tnum a, struct tnum b);
36/* Subtract two tnums, return @a - @b */36/* Subtract two tnums, return @a - @b */