Merge pull request #160 from sched-ext/htejun

scx: Trivial updates from patch splitting

kernel/sched/ext.c

@@ -4453,8 +4453,8 @@ void __init init_sched_ext_class(void)
 	 * definitions so that BPF scheduler implementations can use them
 	 * through the generated vmlinux.h.
 	 */
-	WRITE_ONCE(v, SCX_ENQ_WAKEUP | SCX_DEQ_SLEEP | SCX_TG_ONLINE |
-		   SCX_KICK_PREEMPT);
+	WRITE_ONCE(v, SCX_ENQ_WAKEUP | SCX_DEQ_SLEEP | SCX_KICK_PREEMPT |
+		   SCX_TG_ONLINE);
 
 	BUG_ON(rhashtable_init(&dsq_hash, &dsq_hash_params));
 	init_dsq(&scx_dsq_global, SCX_DSQ_GLOBAL);

tools/sched_ext/include/scx/compat.bpf.h

@@ -34,8 +34,6 @@ static inline void __COMPAT_scx_bpf_switch_all(void)
 		scx_bpf_switch_all();
 }
 
-#endif
-
 /*
  * sched_ext_ops.exit_dump_len is a recent addition. Use the following
  * definition to support older kernels. See scx_qmap for usage example.
@@ -86,3 +84,5 @@ struct sched_ext_ops___no_exit_dump_len {
 	struct sched_ext_ops___no_exit_dump_len __name##___no_exit_dump_len = {	\
 		__VA_ARGS__							\
 	};									\
+
+#endif	/* __SCX_COMPAT_BPF_H */

tools/sched_ext/scx_qmap.bpf.c

@@ -27,11 +27,11 @@
 char _license[] SEC("license") = "GPL";
 
 const volatile u64 slice_ns = SCX_SLICE_DFL;
-const volatile bool switch_partial;
 const volatile u32 stall_user_nth;
 const volatile u32 stall_kernel_nth;
 const volatile u32 dsp_inf_loop_after;
 const volatile s32 disallow_tgid;
+const volatile bool switch_partial;
 
 u32 test_error_cnt;
 

tools/sched_ext/scx_simple.c

@@ -63,7 +63,7 @@ int main(int argc, char **argv)
 	skel = scx_simple__open();
 	SCX_BUG_ON(!skel, "Failed to open skel");
 
-	while ((opt = getopt(argc, argv, "fph")) != -1) {
+	while ((opt = getopt(argc, argv, "fh")) != -1) {
 		switch (opt) {
 		case 'f':
 			skel->rodata->fifo_sched = true;