From 6f5d73771f0f1b6af6691a6101a73317f1a16fb0 Mon Sep 17 00:00:00 2001 From: fslongjin Date: Sun, 17 Jul 2022 23:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/debug/bug.h | 4 ++-- kernel/driver/disk/ahci/ahci.c | 4 ++-- kernel/smp/smp.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/debug/bug.h b/kernel/debug/bug.h index 24f57620..83cc8bec 100644 --- a/kernel/debug/bug.h +++ b/kernel/debug/bug.h @@ -4,11 +4,11 @@ /** * @brief 当condition为true时输出警告信息 - * + * */ #define WARN_ON(condition) ({ \ int __ret_warn_on = !!(condition); \ if (unlikely(__ret_warn_on)) \ kwarn("Assertion failed at %s:%d", __FILE__, __LINE__); \ unlikely(__ret_warn_on); \ -}) \ No newline at end of file +}) diff --git a/kernel/driver/disk/ahci/ahci.c b/kernel/driver/disk/ahci/ahci.c index 92ecb277..8d5a07b9 100644 --- a/kernel/driver/disk/ahci/ahci.c +++ b/kernel/driver/disk/ahci/ahci.c @@ -10,8 +10,8 @@ struct block_device_request_queue ahci_req_queue; uint32_t count_ahci_devices = 0; -uint64_t ahci_port_base_vaddr; // 端口映射base addr -uint64_t ahci_port_base_phys_addr; // 端口映射的物理基地址(ahci控制器的参数的地址都是物理地址) +static uint64_t ahci_port_base_vaddr; // 端口映射base addr +static uint64_t ahci_port_base_phys_addr; // 端口映射的物理基地址(ahci控制器的参数的地址都是物理地址) static void start_cmd(HBA_PORT *port); static void stop_cmd(HBA_PORT *port); diff --git a/kernel/smp/smp.c b/kernel/smp/smp.c index f981f70c..0bd87513 100644 --- a/kernel/smp/smp.c +++ b/kernel/smp/smp.c @@ -156,7 +156,7 @@ void smp_ap_start() spin_unlock(&multi_core_starting_lock); preempt_disable();// 由于ap处理器的pcb与bsp的不同,因此ap处理器放锁时,需要手动恢复preempt count sti(); - kdebug("1212221212"); + while (1) hlt();