Commit 87702a33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched-urgent-2020-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Thomas Gleixner:
 "Two scheduler fixes:

   - A trivial build fix for sched_feat() to compile correctly with
     CONFIG_JUMP_LABEL=n

   - Replace a zero lenght array with a flexible array"

* tag 'sched-urgent-2020-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/features: Fix !CONFIG_JUMP_LABEL case
  sched: Replace zero-length array with flexible-array
parents a3d1b312 a73f863a

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp); 


DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);



#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_JUMP_LABEL)

#ifdef CONFIG_SCHED_DEBUG

/*

 * Debugging: various feature bits

 *

kernel/sched/sched.h

+11 −4
Original line number Diff line number Diff line
@@ -1471,7 +1471,7 @@ struct sched_group_capacity { 
	int			id;

#endif



	unsigned long		cpumask[0];		/* Balance mask */

	unsigned long		cpumask[];		/* Balance mask */

};



struct sched_group {
@@ -1629,7 +1629,7 @@ enum { 


#undef SCHED_FEAT



#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_JUMP_LABEL)

#ifdef CONFIG_SCHED_DEBUG



/*

 * To support run-time toggling of sched features, all the translation units
@@ -1637,6 +1637,7 @@ enum { 
 */

extern const_debug unsigned int sysctl_sched_features;



#ifdef CONFIG_JUMP_LABEL

#define SCHED_FEAT(name, enabled)					\

static __always_inline bool static_branch_##name(struct static_key *key) \

{									\
@@ -1649,7 +1650,13 @@ static __always_inline bool static_branch_##name(struct static_key *key) \ 
extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];

#define sched_feat(x) (static_branch_##x(&sched_feat_keys[__SCHED_FEAT_##x]))



#else /* !(SCHED_DEBUG && CONFIG_JUMP_LABEL) */

#else /* !CONFIG_JUMP_LABEL */



#define sched_feat(x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x))



#endif /* CONFIG_JUMP_LABEL */



#else /* !SCHED_DEBUG */



/*

 * Each translation unit has its own copy of sysctl_sched_features to allow
@@ -1665,7 +1672,7 @@ static const_debug __maybe_unused unsigned int sysctl_sched_features = 


#define sched_feat(x) !!(sysctl_sched_features & (1UL << __SCHED_FEAT_##x))



#endif /* SCHED_DEBUG && CONFIG_JUMP_LABEL */

#endif /* SCHED_DEBUG */



extern struct static_key_false sched_numa_balancing;

extern struct static_key_false sched_schedstats;

CRA Git | Maintained and supported by SUSTech CRA and CCSE