History

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Thomas Gleixner: "This scheduler update provides: - The (hopefully) final fix for the vtime accounting issues which were around for quite some time - Use types known to user space in UAPI headers to unbreak user space builds - Make load balancing respect the current scheduling domain again instead of evaluating unrelated CPUs" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/headers/uapi: Fix linux/sched/types.h userspace compilation errors sched/fair: Fix load_balance() affinity redo path sched/cputime: Accumulate vtime on top of nsec clocksource sched/cputime: Move the vtime task fields to their own struct sched/cputime: Rename vtime fields sched/cputime: Always set tsk->vtime_snap_whence after accounting vtime vtime, sched/cputime: Remove vtime_account_user() Revert "sched/cputime: Refactor the cputime_adjust() code"

Linus Torvalds committed 9 years ago

Commit 4fde8462 parents c3931a8 242fc357 files · +165 −113Browse files

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

Unified · Split

include/uapi/linux/sched/types.h+8−8
@@ -54,21 +54,21 @@ struct sched_param { · 53 unmodified lines
54 * available in the scheduling class file or in Documentation/.54 * available in the scheduling class file or in Documentation/.
55 */55 */
56struct sched_attr {56struct sched_attr {
57 u32 size;57 __u32 size;
58 58
59 u32 sched_policy;59 __u32 sched_policy;
60 u64 sched_flags;60 __u64 sched_flags;
61 61
62 /* SCHED_NORMAL, SCHED_BATCH */62 /* SCHED_NORMAL, SCHED_BATCH */
63 s32 sched_nice;63 __s32 sched_nice;
64 64
65 /* SCHED_FIFO, SCHED_RR */65 /* SCHED_FIFO, SCHED_RR */
66 u32 sched_priority;66 __u32 sched_priority;
67 67
68 /* SCHED_DEADLINE */68 /* SCHED_DEADLINE */
69 u64 sched_runtime;69 __u64 sched_runtime;
70 u64 sched_deadline;70 __u64 sched_deadline;
71 u64 sched_period;71 __u64 sched_period;
72};72};
73 73
74#endif /* _UAPI_LINUX_SCHED_TYPES_H */74#endif /* _UAPI_LINUX_SCHED_TYPES_H */