History

Merge 5.5-rc7 into usb-next

We need the USB fixes in here as well.

Greg Kroah-Hartman committed 6 years ago

Commit dd7d99d2 parents 42bbdd9 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
328328 unsigned int max_sectors;
329329 unsigned int max_segment_size;
330330 unsigned int physical_block_size;
331+ unsigned int logical_block_size;
331332 unsigned int alignment_offset;
332333 unsigned int io_min;
333334 unsigned int io_opt;
@@ -338,7 +339,6 @@ struct queue_limits { · 4 unmodified lines
338339 unsigned int discard_granularity;
339340 unsigned int discard_alignment;
340341
341− unsigned short logical_block_size;
342342 unsigned short max_segments;
343343 unsigned short max_integrity_segments;
344344 unsigned short max_discard_segments;
@@ -1077,7 +1077,7 @@ extern void blk_queue_max_write_same_sectors(struct request_queue *q, · 732 unmodified lines
10771077 unsigned int max_write_same_sectors);
10781078 extern void blk_queue_max_write_zeroes_sectors(struct request_queue *q,
10791079 unsigned int max_write_same_sectors);
1080−extern void blk_queue_logical_block_size(struct request_queue *, unsigned short);
1080+extern void blk_queue_logical_block_size(struct request_queue *, unsigned int);
10811081 extern void blk_queue_physical_block_size(struct request_queue *, unsigned int);
10821082 extern void blk_queue_alignment_offset(struct request_queue *q,
10831083 unsigned int alignment);
@@ -1291,7 +1291,7 @@ static inline unsigned int queue_max_segment_size(const struct request_queue *q) · 207 unmodified lines
12911291 return q->limits.max_segment_size;
12921292 }
12931293
1294−static inline unsigned short queue_logical_block_size(const struct request_queue *q)
1294+static inline unsigned queue_logical_block_size(const struct request_queue *q)
12951295 {
12961296 int retval = 512;
12971297
@@ -1301,7 +1301,7 @@ static inline unsigned short queue_logical_block_size(const struct request_queue · 3 unmodified lines
13011301 return retval;
13021302 }
13031303
1304−static inline unsigned short bdev_logical_block_size(struct block_device *bdev)
1304+static inline unsigned int bdev_logical_block_size(struct block_device *bdev)
13051305 {
13061306 return queue_logical_block_size(bdev_get_queue(bdev));
13071307 }
include/linux/mm.h+15−3
@@ -2658,13 +2658,25 @@ static inline bool want_init_on_free(void) · 2657 unmodified lines
26582658 !page_poisoning_enabled();
26592659 }
26602660
2661−#ifdef CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT
2662−DECLARE_STATIC_KEY_TRUE(_debug_pagealloc_enabled);
2661+#ifdef CONFIG_DEBUG_PAGEALLOC
2662+extern void init_debug_pagealloc(void);
26632663 #else
2664−DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled);
2664+static inline void init_debug_pagealloc(void) {}
26652665 #endif
2666+extern bool _debug_pagealloc_enabled_early;
2667+DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled);
26662668
26672669 static 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+ */
2679+static inline bool debug_pagealloc_enabled_static(void)
26682680 {
26692681 if (!IS_ENABLED(CONFIG_DEBUG_PAGEALLOC))
26702682 return false;
include/linux/mmzone.h+2−3
@@ -215,9 +215,8 @@ enum node_stat_item { · 214 unmodified lines
215215 NR_INACTIVE_FILE, /* " " " " " */
216216 NR_ACTIVE_FILE, /* " " " " " */
217217 NR_UNEVICTABLE, /* " " " " " */
218− NR_SLAB_RECLAIMABLE, /* Please do not reorder this item */
219− NR_SLAB_UNRECLAIMABLE, /* and this one without looking at
220− * memcg_flush_percpu_vmstats() first. */
218+ NR_SLAB_RECLAIMABLE,
219+ NR_SLAB_UNRECLAIMABLE,
221220 NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */
222221 NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */
223222 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
3434
3535 /* internal use only */
3636 #define LOOKUP_PARENT 0x0010
37−#define LOOKUP_NO_REVAL 0x0080
3837 #define LOOKUP_JUMPED 0x1000
3938 #define LOOKUP_ROOT 0x2000
4039 #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
19291929
19301930 /*
19311931 * 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.
19331933 */
19341934 static inline void rseq_fork(struct task_struct *t, unsigned long clone_flags)
19351935 {
1936− if (clone_flags & CLONE_THREAD) {
1936+ if (clone_flags & CLONE_VM) {
19371937 t->rseq = NULL;
19381938 t->rseq_sig = 0;
19391939 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
358358 static inline void sk_psock_restore_proto(struct sock *sk,
359359 struct sk_psock *psock)
360360 {
361− sk->sk_write_space = psock->saved_write_space;
361+ sk->sk_prot->unhash = psock->saved_unhash;
362362
363363 if (psock->sk_proto) {
364364 struct inet_connection_sock *icsk = inet_csk(sk);
365365 bool has_ulp = !!icsk->icsk_ulp_data;
366366
367− if (has_ulp)
368− tcp_update_ulp(sk, psock->sk_proto);
369− else
367+ if (has_ulp) {
368+ tcp_update_ulp(sk, psock->sk_proto,
369+ psock->saved_write_space);
370+ } else {
370371 sk->sk_prot = psock->sk_proto;
372+ sk->sk_write_space = psock->saved_write_space;
373+ }
371374 psock->sk_proto = NULL;
375+ } else {
376+ sk->sk_write_space = psock->saved_write_space;
372377 }
373378 }
374379
include/linux/tnum.h+1−1
@@ -30,7 +30,7 @@ struct tnum tnum_lshift(struct tnum a, u8 shift); · 29 unmodified lines
3030 /* Shift (rsh) a tnum right (by a fixed shift) */
3131 struct tnum tnum_rshift(struct tnum a, u8 shift);
3232 /* Shift (arsh) a tnum right (by a fixed min_shift) */
33−struct tnum tnum_arshift(struct tnum a, u8 min_shift);
33+struct tnum tnum_arshift(struct tnum a, u8 min_shift, u8 insn_bitness);
3434 /* Add two tnums, return @a + @b */
3535 struct tnum tnum_add(struct tnum a, struct tnum b);
3636 /* Subtract two tnums, return @a - @b */