Pull scheduler updates from Ingo Molnar: "The main changes in this cycle were: - Add the SYSTEM_SCHEDULING bootup state to move various scheduler debug checks earlier into the bootup. This turns silent and sporadically deadly bugs into nice, deterministic splats. Fix some of the splats that triggered. (Thomas Gleixner) - A round of restructuring and refactoring of the load-balancing and topology code (Peter Zijlstra) - Another round of consolidating ~20 of incremental scheduler code history: this time in terms of wait-queue nomenclature. (I didn't get much feedback on these renaming patches, and we can still easily change any names I might have misplaced, so if anyone hates a new name, please holler and I'll fix it.) (Ingo Molnar) - sched/numa improvements, fixes and updates (Rik van Riel) - Another round of x86/tsc scheduler clock code improvements, in hope of making it more robust (Peter Zijlstra) - Improve NOHZ behavior (Frederic Weisbecker) - Deadline scheduler improvements and fixes (Luca Abeni, Daniel Bristot de Oliveira) - Simplify and optimize the topology setup code (Lauro Ramos Venancio) - Debloat and decouple scheduler code some more (Nicolas Pitre) - Simplify code by making better use of llist primitives (Byungchul Park) - ... plus other fixes and improvements" * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (103 commits) sched/cputime: Refactor the cputime_adjust() code sched/debug: Expose the number of RT/DL tasks that can migrate sched/numa: Hide numa_wake_affine() from UP build sched/fair: Remove effective_load() sched/numa: Implement NUMA node level wake_affine() sched/fair: Simplify wake_affine() for the single socket case sched/numa: Override part of migrate_degrades_locality() when idle balancing sched/rt: Move RT related code from sched/core.c to sched/rt.c sched/deadline: Move DL related code from sched/core.c to sched/deadline.c sched/cpuset: Only offer CONFIG_CPUSETS if SMP is enabled sched/fair: Spare idle load balancing on nohz_full CPUs nohz: Move idle balancer registration to the idle path sched/loadavg: Generalize "_idle" naming to "_nohz" sched/core: Drop the unused try_get_task_struct() helper function sched/fair: WARN() and refuse to set buddy when !se->on_rq sched/debug: Fix SCHED_WARN_ON() to return a value on !CONFIG_SCHED_DEBUG as well sched/wait: Disambiguate wq_entry->task_list and wq_head->task_list naming sched/wait: Move bit_wait_table[] and related functionality from sched/core.c to sched/wait_bit.c sched/wait: Split out the wait_bit*() APIs from <linux/wait.h> into <linux/wait_bit.h> sched/wait: Re-adjust macro line continuation backslashes in <linux/wait.h> ...
Showing the changes to include/uapi/linux (3 of 156 files). Show all
Unified · Split
| @@ -26,7 +26,7 @@ · 25 unmodified lines | |||
| 26 | #define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION | 26 | #define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed | 29 | * The wait_queue_entry_token (autofs_wqt_t) is part of a structure which is passed |
| 30 | * back to the kernel via ioctl from userspace. On architectures where 32- and | 30 | * back to the kernel via ioctl from userspace. On architectures where 32- and |
| 31 | * 64-bit userspace binaries can be executed it's important that the size of | 31 | * 64-bit userspace binaries can be executed it's important that the size of |
| 32 | * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we | 32 | * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we |
| @@ -49,7 +49,7 @@ struct autofs_packet_hdr { · 16 unmodified lines | |||
| 49 | 49 | ||
| 50 | struct autofs_packet_missing { | 50 | struct autofs_packet_missing { |
| 51 | struct autofs_packet_hdr hdr; | 51 | struct autofs_packet_hdr hdr; |
| 52 | autofs_wqt_t wait_queue_token; | 52 | autofs_wqt_t wait_queue_entry_token; |
| 53 | int len; | 53 | int len; |
| 54 | char name[NAME_MAX+1]; | 54 | char name[NAME_MAX+1]; |
| 55 | }; | 55 | }; |
| @@ -108,7 +108,7 @@ enum autofs_notify { · 107 unmodified lines | |||
| 108 | /* v4 multi expire (via pipe) */ | 108 | /* v4 multi expire (via pipe) */ |
| 109 | struct autofs_packet_expire_multi { | 109 | struct autofs_packet_expire_multi { |
| 110 | struct autofs_packet_hdr hdr; | 110 | struct autofs_packet_hdr hdr; |
| 111 | autofs_wqt_t wait_queue_token; | 111 | autofs_wqt_t wait_queue_entry_token; |
| 112 | int len; | 112 | int len; |
| 113 | char name[NAME_MAX+1]; | 113 | char name[NAME_MAX+1]; |
| 114 | }; | 114 | }; |
| @@ -123,7 +123,7 @@ union autofs_packet_union { · 8 unmodified lines | |||
| 123 | /* autofs v5 common packet struct */ | 123 | /* autofs v5 common packet struct */ |
| 124 | struct autofs_v5_packet { | 124 | struct autofs_v5_packet { |
| 125 | struct autofs_packet_hdr hdr; | 125 | struct autofs_packet_hdr hdr; |
| 126 | autofs_wqt_t wait_queue_token; | 126 | autofs_wqt_t wait_queue_entry_token; |
| 127 | __u32 dev; | 127 | __u32 dev; |
| 128 | __u64 ino; | 128 | __u64 ino; |
| 129 | __u32 uid; | 129 | __u32 uid; |
| @@ -47,5 +47,6 @@ · 46 unmodified lines | |||
| 47 | * For the sched_{set,get}attr() calls | 47 | * For the sched_{set,get}attr() calls |
| 48 | */ | 48 | */ |
| 49 | #define SCHED_FLAG_RESET_ON_FORK 0x01 | 49 | #define SCHED_FLAG_RESET_ON_FORK 0x01 |
| 50 | #define SCHED_FLAG_RECLAIM 0x02 | ||
| 50 | 51 | ||
| 51 | #endif /* _UAPI_LINUX_SCHED_H */ | 52 | #endif /* _UAPI_LINUX_SCHED_H */ |