From 173c988d5de29ab964da22ea48dfeec2b386fc29 Mon Sep 17 00:00:00 2001 From: longjin Date: Mon, 17 Oct 2022 18:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=99=A8=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/arch/x86_64/asm/cmpxchg.h | 2 +- kernel/common/hid.h | 2 +- kernel/process/process.h | 3 ++- kernel/sched/cfs.h | 6 ------ kernel/sched/sched.h | 8 +++++++- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/kernel/arch/x86_64/asm/cmpxchg.h b/kernel/arch/x86_64/asm/cmpxchg.h index f63ad259..520b4a97 100644 --- a/kernel/arch/x86_64/asm/cmpxchg.h +++ b/kernel/arch/x86_64/asm/cmpxchg.h @@ -78,4 +78,4 @@ extern void __cmpxchg_wrong_size(void) __compiletime_error("Bad argument size fo }) #define arch_try_cmpxchg(ptr, old_ptr, new_ptr) \ - __raw_try_cmpxchg((ptr), (old_ptr), (new_ptr), sizeof(*ptr)) \ No newline at end of file + __raw_try_cmpxchg((ptr), (old_ptr), (new_ptr), sizeof(*ptr)) diff --git a/kernel/common/hid.h b/kernel/common/hid.h index a215de3a..35ca8690 100644 --- a/kernel/common/hid.h +++ b/kernel/common/hid.h @@ -77,7 +77,7 @@ struct hid_parser int usage_max; int cnt_objects; // report descriptor中的对象数目 - int cnt_report // report desc中的report数目 + int cnt_report; // report desc中的report数目 }; diff --git a/kernel/process/process.h b/kernel/process/process.h index c2b9a700..9b6a0d16 100644 --- a/kernel/process/process.h +++ b/kernel/process/process.h @@ -44,7 +44,8 @@ .next_pcb = &proc, \ .parent_pcb = &proc, \ .exit_code = 0, \ - .wait_child_proc_exit = 0 \ + .wait_child_proc_exit = 0, \ + .worker_private = NULL \ } /** diff --git a/kernel/sched/cfs.h b/kernel/sched/cfs.h index 734783d4..00320e54 100644 --- a/kernel/sched/cfs.h +++ b/kernel/sched/cfs.h @@ -37,9 +37,3 @@ struct process_control_block *sched_cfs_dequeue(); * */ void sched_cfs_init(); - -/** - * @brief 当时钟中断到达时,更新时间片 - * - */ -void sched_update_jiffies(); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 8f088354..085050f9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -15,4 +15,10 @@ void sched_enqueue(struct process_control_block *pcb); void sched(); -void sched_init(); \ No newline at end of file +void sched_init(); + +/** + * @brief 当时钟中断到达时,更新时间片 + * + */ +void sched_update_jiffies(); \ No newline at end of file