Guest User

Untitled

a guest
Oct 17th, 2017
82
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.09 KB | None | 0 0
  1. --- a/kernel/sched/MuQSS.c
  2. +++ b/kernel/sched/MuQSS.c
  3. @@ -37,0 +38 @@
  4. +#include <linux/wait_bit.h>
  5. @@ -1706,8 +1707,2 @@ void sched_ttwu_pending(void)
  6. - while (llist) {
  7. - int wake_flags = 0;
  8. -
  9. - p = llist_entry(llist, struct task_struct, wake_entry);
  10. - llist = llist_next(llist);
  11. -
  12. - ttwu_do_activate(rq, p, wake_flags);
  13. - }
  14. + llist_for_each_entry_safe(p, t, llist, wake_entry)
  15. + ttwu_do_activate(rq, p, 0);
  16. @@ -6194,3 +6188,0 @@ int sched_cpu_deactivate(unsigned int cpu)
  17. - * For CONFIG_PREEMPT we have preemptible RCU and its sync_rcu() might
  18. - * not imply sync_sched(), so wait for both.
  19. - *
  20. @@ -6199,4 +6191 @@ int sched_cpu_deactivate(unsigned int cpu)
  21. - if (IS_ENABLED(CONFIG_PREEMPT))
  22. - synchronize_rcu_mult(call_rcu, call_rcu_sched);
  23. - else
  24. - synchronize_rcu();
  25. + synchronize_rcu_mult(call_rcu, call_rcu_sched);
  26. @@ -6298 +6286,0 @@ void __init sched_init_smp(void)
  27. - alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
  28. @@ -6402 +6389,0 @@ void __init sched_init_smp(void)
  29. - sched_clock_init_late();
  30. @@ -6409 +6395,0 @@ void __init sched_init_smp(void)
  31. - sched_clock_init_late();
  32. @@ -6445,13 +6430,0 @@ static struct kmem_cache *task_group_cache __read_mostly;
  33. -#define WAIT_TABLE_BITS 8
  34. -#define WAIT_TABLE_SIZE (1 << WAIT_TABLE_BITS)
  35. -static wait_queue_head_t bit_wait_table[WAIT_TABLE_SIZE] __cacheline_aligned;
  36. -
  37. -wait_queue_head_t *bit_waitqueue(void *word, int bit)
  38. -{
  39. - const int shift = BITS_PER_LONG == 32 ? 5 : 6;
  40. - unsigned long val = (unsigned long)word << shift | bit;
  41. -
  42. - return bit_wait_table + hash_long(val, WAIT_TABLE_BITS);
  43. -}
  44. -EXPORT_SYMBOL(bit_waitqueue);
  45. -
  46. @@ -6468,2 +6441 @@ void __init sched_init(void)
  47. - for (i = 0; i < WAIT_TABLE_SIZE; i++)
  48. - init_waitqueue_head(bit_wait_table + i);
  49. + wait_bit_init();
  50. @@ -504 +502,5 @@ struct sched_group_capacity {
  51. - unsigned long cpumask[0]; /* iteration mask */
  52. +#ifdef CONFIG_SCHED_DEBUG
  53. + int id;
  54. +#endif
  55. +
  56. + unsigned long cpumask[0]; /* balance mask */
  57. @@ -531,2 +533 @@ static inline struct cpumask *sched_group_cpus(struct sched_group *sg)
  58. - * cpumask masking which cpus in the group are allowed to iterate up the domain
  59. - * tree.
  60. + * See build_balance_mask().
Add Comment
Please, Sign In to add comment