Merge branch into tip/master: 'sched/core'

 # New commits in sched/core:
    4a3b51aab6e2 ("smpboot: Don't park the thread if work is pending")
    40dcc9bdbef3 ("irq_work: Flush lazy work CPU down on PREEMPT_RT")
    791b1760accd ("irq_work: Update a comment regarding CPU hotplug invocation")
    648d44bda731 ("sched/topology: Add asymmetric SMT packing override")
    c8fc4136fd3c ("sched/fair: Honor asymmetric SMT priority in idle selection")
    53bc5c556b82 ("sched: Set TIF_NEED_RESCHED before calling __trace_set_need_resched()")
    4b1f75be23c4 ("sched/core: Fix context analysis errors in non-preferred CPU push")
    1fb28c664a19 ("virt/steal_governor: Enable the driver")
    27d47ebce4d6 ("virt/steal_governor: Implement steal_governor policy loop")
    4b9302d494ff ("virt/steal_governor: Add control knobs for handling steal values")
    9a8e740ee9f6 ("virt: Introduce steal governor driver")
    68957caaa9c0 ("sched/debug: Add migration stats due to non preferred CPUs")
    74699f56ebcf ("sched/core: Push current task from non preferred CPU")
    4ee29b029058 ("sched/fair: Load balance only among preferred CPUs")
    d8a3da0de843 ("sched/core: Try to use a preferred CPU in is_cpu_allowed")
    620824516557 ("sysfs: Add preferred CPU file")
    518b32bd5bb3 ("cpumask: Introduce cpu_preferred_mask")
    06a49ef784ac ("sched/docs: Document cpu_preferred_mask and Preferred CPU concept")
    cfb463b7172d ("cpumask: Introduce cpumask_intersects_and")
    a8d0854a76a8 ("sched/cputime: Add kcpustat_field_total helper")
    be100c77178e ("sched: Add sched_ext hooks for proxy execution")
    57c75e3ae38c ("sched: Add helper to block retained proxy donors")
    a49653d0abeb ("sched/core: Mark wakeups completed through ttwu_runnable()")
    8f8c0417e973 ("sched/core: Dequeue waking proxy donors before reset")
    313b652837d0 ("sched/core: Drop mutex locks before proxy rescheduling")
    627ea30aca3b ("sched/wait: Clarify WF_SYNC wakeup semantics")
    d2e010082757 ("sched/eevdf: Handle more short slice waking cases")
    4bf32ec3327d ("sched/eevdf: Align update_protect_slice to set_protect_slice")
    aae2a33ea662 ("sched/eevdf: Ensure that vprot will never go above a min slice")
    c9ce69fc43bd ("sched/fair: Randomize equally shallow slow-path candidates")
    abe440b3770f ("sched/fair: Drop idle recency from slow-path CPU selection")
    fbbc63fed0b0 ("sched/core: Remove redundant core_sched_seq")
    819224e506bc ("sched/fair: Remove dead code on enqueue_task_fair()")
    c72945693b90 ("sched: Restart fair hrtick after same-task repicks")
    a9b3c7570564 ("sched/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in the <uapi/linux/sched.h> header")
    e81ee0630837 ("sched/fair: Reset NUMA fault locality after scan period update")
    ef9293b3b797 ("sched: dynamic: Fix preemption model strings")
    879eaa76e608 ("sched: Remove unneeded function type cast in do_balance_callbacks()")
    f549101187c8 ("sched/deadline: check start_dl_timer expiry with ktime_before()")
    2a672daa4b27 ("sched/feat: Use the new static key API for sched_feat")
    a5576ebce920 ("sched: Convert paravirt_steal to new static key APIs")
    9650ce11f2e3 ("sched: dynamic: Simplify preempt model accessors")
    5b9a28eeed37 ("sched: dynamic: Remove HAVE_PREEMPT_DYNAMIC_{CALL,KEY}")
    aa4178f63847 ("sched: dynamic: Simplify irqentry_exit_cond_resched()")
    b9d267b9d632 ("sched: dynamic: Simplify preempt_schedule{,_notrace}()")
    88e0b3bb9930 ("sched: dynamic: Simplify {cond,might}_resched()")
    d3d16750693b ("sched: dynamic: Make PREEMPT_DYNAMIC depend on ARCH_HAS_PREEMPT_LAZY")
    772d9ffbfd26 ("sched: Migrate whole chain in proxy_migrate_task()")
    6b73a09e943f ("sched: Break out core of attach_tasks() helper into sched.h")
    1f8805138593 ("sched: Switch rq->next_class in proxy_reset_donor()")
    09351db90a28 ("sched/core: Don't proxy-exec unmatched cookie lock owners")
    9be817f991e2 ("sched/core: Avoid migrating blocked_on tasks")
    3dd95f077371 ("sched/core: Don't steal a proxy-exec donor")

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h
index 33a4624285cd..19ffeba89428 100644
--- a/include/uapi/linux/sched.h
+++ b/include/uapi/linux/sched.h
@@ -53,7 +53,7 @@
  */
 #define UNSHARE_EMPTY_MNTNS 0x00100000 /* Unshare an empty mount namespace. */
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 /**
  * struct clone_args - arguments for the clone3 syscall
  * @flags:        Flags for the new process as listed above.