From f1ad1b9bb6190e4bca5ad0c9cd61ebabfe974fdd Mon Sep 17 00:00:00 2001 From: chyyuu Date: Mon, 5 Feb 2018 15:54:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20student=20name=20=E7=8E=8B=E4=B9=83?= =?UTF-8?q?=E5=B3=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-chinese.md | 2 +- related_info/labX/lab1_X.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-chinese.md b/README-chinese.md index ca9da67..2fe32a8 100644 --- a/README-chinese.md +++ b/README-chinese.md @@ -239,6 +239,6 @@ OS161教学操作系统、以及Linux-2.4内核。 ucore OS中包含的xv6&jos代码版权属于Frans Kaashoek, Robert Morris, and Russ Cox,使用MIT License。ucore OS中包含的OS/161代码版权属于 David A. Holland。包含的ostep练习的版权属于Remzi H. Arpaci-Dusseau and Andrea C. Arpaci-Dusseau。其他内部开发的ucore OS和相关练习的代码版权属于 -陈渝、王乃铮、向勇,并采用GPL License. ucore OS相关的文档版权属于 +陈渝、王乃峥、向勇,并采用GPL License. ucore OS相关的文档版权属于 陈渝、向勇,并采用 Creative Commons Attribution/Share-Alike (CC-BY-SA) License. diff --git a/related_info/labX/lab1_X.md b/related_info/labX/lab1_X.md index 4fcc31e..4aee964 100644 --- a/related_info/labX/lab1_X.md +++ b/related_info/labX/lab1_X.md @@ -1,7 +1,7 @@ challenge1: 实现内核态与用户态之间的来回切换 =================================================== 状态:已完成,在branch master中的labcodes_answer/lab1_result -完成人:王乃铮 +完成人:王乃峥 challenge2: 用敲键盘实现用户模式内核模式切换 ===================================================