From fd1ec0f919deb98409e52e89ef7961659d192ea5 Mon Sep 17 00:00:00 2001 From: mudongliang Date: Mon, 21 Nov 2016 16:59:01 -0500 Subject: [PATCH] Modify SUMMARY.md to sync gitbook --- Concepts/README.md | 5 ++- Interrupts/README.md | 2 +- MM/README.md | 2 +- SUMMARY.md | 92 ++++++++++++++++++++++++-------------------- SyncPrim/README.md | 1 + Timers/README.md | 7 +++- 6 files changed, 61 insertions(+), 48 deletions(-) diff --git a/Concepts/README.md b/Concepts/README.md index 24a24a1..4570755 100644 --- a/Concepts/README.md +++ b/Concepts/README.md @@ -2,5 +2,6 @@ 本章描述内核中使用到的各种各样的概念。 -* [每 CPU 的变量](http://0xax.gitbooks.io/linux-insides/content/Concepts/per-cpu.html) -* [CPUi 掩码](http://0xax.gitbooks.io/linux-insides/content/Concepts/cpumask.html) +* [每个 CPU 的变量](http://0xax.gitbooks.io/linux-insides/content/Concepts/per-cpu.html) +* [CPU 掩码](http://0xax.gitbooks.io/linux-insides/content/Concepts/cpumask.html) +* [initcall 机制](https://0xax.gitbooks.io/linux-insides/content/Concepts/initcall.html) diff --git a/Interrupts/README.md b/Interrupts/README.md index c91d4da..ad60fff 100644 --- a/Interrupts/README.md +++ b/Interrupts/README.md @@ -11,4 +11,4 @@ * [深入外部硬件中断](interrupts-7.md) - 这部分讲述了关于处理外部硬件中断的一些早期初始化代码。 * [IRQs的非早期初始化](interrupts-8.md) - 这部分讲述了处理外部硬件中断的非早期初始化代码。 * [Softirq, Tasklets and Workqueues](interrupts-9.md) - 这部分讲述了softirqs、tasklets 和 workqueues 的内容. -* [](interrupts-10.md) - 这是中断和中断处理的最后一部分，并且我们将会看到一个真实的硬件驱动和中断。 +* [最后一部分](interrupts-10.md) - 这是中断和中断处理的最后一部分，并且我们将会看到一个真实的硬件驱动和中断。 diff --git a/MM/README.md b/MM/README.md index b79275c..644af07 100644 --- a/MM/README.md +++ b/MM/README.md @@ -2,5 +2,5 @@ 本章描述 Linux 内核中的内存管理。在本章中你会看到一系列描述 Linux 内核内存管理框架的不同部分的帖子。 -* [Memblock](https://github.com/MintCN/linux-insides-zh/blob/master/MM/linux-mm-1.md) - 描述早期的 `memblock` 分配器。 +* [内存块](https://github.com/MintCN/linux-insides-zh/blob/master/MM/linux-mm-1.md) - 描述早期的 `memblock` 分配器。 * [固定映射地址和 ioremap ](https://github.com/MintCN/linux-insides-zh/blob/master/MM/linux-mm-2.md) - 描述固定映射的地址和早期的 `ioremap` 。 diff --git a/SUMMARY.md b/SUMMARY.md index 20abe95..0721266 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -7,66 +7,74 @@ * [视频模式初始化和转换到保护模式](Booting/linux-bootstrap-3.md) * [过渡到 64 位模式](Booting/linux-bootstrap-4.md) * [内核解压缩](Booting/linux-bootstrap-5.md) -* [Initialization](Initialization/README.md) - * [First steps in the kernel](Initialization/linux-initialization-1.md) - * [Early interrupts handler](Initialization/linux-initialization-2.md) - * [Last preparations before the kernel entry point](Initialization/linux-initialization-3.md) - * [Kernel entry point](Initialization/linux-initialization-4.md) - * [Continue architecture-specific boot-time initializations](Initialization/linux-initialization-5.md) - * [Architecture-specific initializations, again...](Initialization/linux-initialization-6.md) - * [End of the architecture-specific initializations, almost...](Initialization/linux-initialization-7.md) - * [Scheduler initialization](Initialization/linux-initialization-8.md) - * [RCU initialization](Initialization/linux-initialization-9.md) - * [End of initialization](Initialization/linux-initialization-10.md) -* [Interrupts](Interrupts/README.md) - * [Introduction](Interrupts/interrupts-1.md) - * [Start to dive into interrupts](Interrupts/interrupts-2.md) - * [Interrupt handlers](Interrupts/interrupts-3.md) - * [Initialization of non-early interrupt gates](Interrupts/interrupts-4.md) - * [Implementation of some exception handlers](Interrupts/interrupts-5.md) - * [Handling Non-Maskable interrupts](Interrupts/interrupts-6.md) - * [Dive into external hardware interrupts](Interrupts/interrupts-7.md) - * [Initialization of external hardware interrupts structures](Interrupts/interrupts-8.md) +* [初始化](Initialization/README.md) + * [内核解压之后的首要步骤](Initialization/linux-initialization-1.md) + * [早期的中断和异常控制](Initialization/linux-initialization-2.md) + * [在到达内核入口之前最后的准备](Initialization/linux-initialization-3.md) + * [内核入口 - start_kernel](Initialization/linux-initialization-4.md) + * [体系架构初始化](Initialization/linux-initialization-5.md) + * [进一步初始化指定体系架构](Initialization/linux-initialization-6.md) + * [最后对指定体系架构初始化](Initialization/linux-initialization-7.md) + * [调度器初始化](Initialization/linux-initialization-8.md) + * [RCU 初始化](Initialization/linux-initialization-9.md) + * [初始化结束](Initialization/linux-initialization-10.md) +* [中断](Interrupts/README.md) + * [中断和中断处理 Part 1.](Interrupts/interrupts-1.md) + * [深入 Linux 内核中的中断](Interrupts/interrupts-2.md) + * [初步中断处理](Interrupts/interrupts-3.md) + * [中断处理](Interrupts/interrupts-4.md) + * [异常处理的实现](Interrupts/interrupts-5.md) + * [处理不可屏蔽中断](Interrupts/interrupts-6.md) + * [深入外部硬件中断](Interrupts/interrupts-7.md) + * [IRQs的非早期初始化](Interrupts/interrupts-8.md) * [Softirq, Tasklets and Workqueues](Interrupts/interrupts-9.md) - * [Last part](Interrupts/interrupts-10.md) -* [System calls](SysCall/README.md) - * [Introduction to system calls](SysCall/syscall-1.md) - * [How the Linux kernel handles a system call](SysCall/syscall-2.md) + * [最后一部分](Interrupts/interrupts-10.md) +* [系统调用](SysCall/README.md) + * [系统调用概念简介](SysCall/syscall-1.md) + * [Linux 内核如何处理系统调用](SysCall/syscall-2.md) * [vsyscall and vDSO](SysCall/syscall-3.md) - * [How the Linux kernel runs a program](SysCall/syscall-4.md) -* [Timers and time management](Timers/README.md) - * [Introduction](Timers/timers-1.md) - * [Clocksource framework](Timers/timers-2.md) + * [Linux 内核如何运行程序](SysCall/syscall-4.md) +* [定时器和时钟管理](Timers/README.md) + * [简介](Timers/timers-1.md) + * [时钟源框架简介](Timers/timers-2.md) * [The tick broadcast framework and dyntick](Timers/timers-3.md) - * [Introduction to timers](Timers/timers-4.md) - * [Clockevents framework](Timers/timers-5.md) - * [x86 related clock sources](Timers/timers-6.md) - * [Time related system calls](Timers/timers-7.md) -* [Synchronization primitives](SyncPrim/README.md) - * [Introduction to spinlocks](SyncPrim/sync-1.md) -* [Memory management](mm/README.md) - * [Memblock](mm/linux-mm-1.md) + * [定时器介绍](Timers/timers-4.md) + * [Clockevents 框架简介](Timers/timers-5.md) + * [x86 相关的时钟源](Timers/timers-6.md) + * [Linux 内核中与时钟相关的系统调用](Timers/timers-7.md) +* [同步原语](SyncPrim/README.md) + * [自旋锁简介](SyncPrim/sync-1.md) + * [队列自旋锁](SyncPrim/sync-2.md) + * [信号量](SyncPrim/sync-3.md) + * [互斥锁](SyncPrim/sync-4.md) + * [读者/写者信号量](SyncPrim/sync-5.md) + * [顺序锁](SyncPrim/sync-6.md) + * [RCU]() + * [Lockdep]() +* [内存管理](mm/README.md) + * [内存块](mm/linux-mm-1.md) * [Fixmaps and ioremap](mm/linux-mm-2.md) * [SMP]() -* [Concepts](Concepts/README.md) - * [Per-CPU variables](Concepts/per-cpu.md) - * [Cpumasks](Concepts/cpumask.md) - * [The initcall mechanism](Concepts/initcall.md) +* [概念](Concepts/README.md) + * [每个 CPU 的变量](Concepts/per-cpu.md) + * [CPU 掩码](Concepts/cpumask.md) + * [initcall 机制](Concepts/initcall.md) * [Linux 内核中的数据结构](DataStructures/README.md) * [双向链表](DataStructures/dlist.md) * [基数树](DataStructures/radix-tree.md) - * [Bit arrays]() + * [位数组](DataStructures/bitmap.md) * [理论](Theory/README.md) * [分页](Theory/Paging.md) * [Elf64 格式](Theory/ELF.md) * [CPUID]() * [MSR]() -* Initial ram disk +* [Initial ram disk]() * [initrd]() * [杂项](Misc/README.md) * [内核编译方法](Misc/how_kernel_compiled.md) * [链接器](Misc/linkers.md) * [Linux 内核开发](Misc/contribute.md) + * [用户空间的程序启动过程](Misc/program_startup.md) * [Write and Submit your first Linux kernel Patch]() * [Data types in the kernel]() * [有帮助的链接](LINKS.md) diff --git a/SyncPrim/README.md b/SyncPrim/README.md index fb83f7b..97a7496 100644 --- a/SyncPrim/README.md +++ b/SyncPrim/README.md @@ -7,3 +7,4 @@ * [信号量](https://0xax.gitbooks.io/linux-insides/content/SyncPrim/sync-3.html) - this part describes impmentation of `semaphore` synchronization primitive in the Linux kernel. 这个部分描述 Linux 内核中的同步原语 `semaphore` 的实现； * [互斥锁](https://0xax.gitbooks.io/linux-insides/content/SyncPrim/sync-4.html) - 这个部分描述 Linux 内核中的 `mutex` ； * [读者/写者信号量](https://0xax.gitbooks.io/linux-insides/content/SyncPrim/sync-5.html) - 这个部分描述特殊类型的信号量 - `reader/writer` 信号量； +* [顺序锁](https://0xax.gitbooks.io/linux-insides/content/SyncPrim/sync-6.html) - 这个部分描述 Linux 内核中的顺序锁. diff --git a/Timers/README.md b/Timers/README.md index f88c9f4..3089190 100644 --- a/Timers/README.md +++ b/Timers/README.md @@ -1,8 +1,11 @@ -# 定时器和时间管理 +# 定时器和时钟管理 -本章介绍 Linux 内核中定时器和时间管理相关的观念。 +本章介绍 Linux 内核中定时器和时钟管理相关的观念。 * [简介](http://0xax.gitbooks.io/linux-insides/content/Timers/timers-1.html) - 简单介绍 Linux 内核中的定时器。 * [时钟源框架简介](https://github.com/0xAX/linux-insides/blob/master/Timers/timers-2.md) - this part describes `clocksource` framework in the Linux kernel. * [The tick broadcast framework and dyntick](https://github.com/0xAX/linux-insides/blob/master/Timers/timers-3.md) - 介绍 tick broadcast framework and dyntick 概念。 * [定时器介绍](https://github.com/0xAX/linux-insides/blob/master/Timers/timers-3.md) - 介绍 Linux 内核中的定时器。 +* [Clockevents 框架简介](https://github.com/0xAX/linux-insides/blob/master/Timers/timers-5.md) - 介绍另外一个时钟管理相关的框架 : `clockevents`. +* [x86 相关的时钟源](https://github.com/0xAX/linux-insides/blob/master/Timers/timers-5.md) - 介绍 `x86_64` 相关的时钟源。 +* [Linux 内核中与时钟相关的系统调用](https://github.com/0xAX/linux-insides/blob/master/Timers/timers-7.md) - 介绍时钟相关的系统调用。