From 72cc33c3c647abe25800265512215d508fe7b437 Mon Sep 17 00:00:00 2001 From: Remi Rampin Date: Sun, 20 Sep 2015 15:30:58 -0400 Subject: [PATCH] TYPO: minor fixes in booting section --- Booting/linux-bootstrap-2.md | 2 +- Booting/linux-bootstrap-3.md | 10 +++++----- Booting/linux-bootstrap-5.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Booting/linux-bootstrap-2.md b/Booting/linux-bootstrap-2.md index 2379001..fd0fe58 100644 --- a/Booting/linux-bootstrap-2.md +++ b/Booting/linux-bootstrap-2.md @@ -224,7 +224,7 @@ Console initialization After the `hdr` is copied into `boot_params.hdr`, the next step is console initialization by calling the `console_init` function which is defined in [arch/x86/boot/early_serial_console.c](https://github.com/torvalds/linux/blob/master/arch/x86/boot/early_serial_console.c). -It tries to find the `earlyprintk` option in the command line and if the search was successful, it parses the port address and baud rate of the serial port and initializes the serial port. Value of `earlyprintk` command line option can be one of the: +It tries to find the `earlyprintk` option in the command line and if the search was successful, it parses the port address and baud rate of the serial port and initializes the serial port. Value of `earlyprintk` command line option can be one of these: * serial,0x3f8,115200 * serial,ttyS0,115200 diff --git a/Booting/linux-bootstrap-3.md b/Booting/linux-bootstrap-3.md index df31090..e3c7503 100644 --- a/Booting/linux-bootstrap-3.md +++ b/Booting/linux-bootstrap-3.md @@ -37,11 +37,11 @@ vga= line is parsed. ``` -So we can add `vga` option to the grub or another bootloader configuration file and it will pass this option to the kernel command line. This option can have different values as we can mentioned in the description, for example it can be an integer number `0xFFFD` or `ask`. If you pass `ask` t `vga`, you will see a menu like this: +So we can add `vga` option to the grub or another bootloader configuration file and it will pass this option to the kernel command line. This option can have different values as we can mentioned in the description, for example it can be an integer number `0xFFFD` or `ask`. If you pass `ask` to `vga`, you will see a menu like this: ![video mode setup menu](http://oi59.tinypic.com/ejcz81.jpg) -which will ask to select a video mode. We will look at it's implementation, but before diving into the implementation we have to look at some other things. +which will ask to select a video mode. We will look at its implementation, but before diving into the implementation we have to look at some other things. Kernel data types -------------------------------------------------------------------------------- @@ -79,10 +79,10 @@ Next is `GET_HEAP` macro: ((type *)__get_heap(sizeof(type),__alignof__(type),(n))) ``` -for heap allocation. It calls internal function `__get_heap` with 3 parameters: +for heap allocation. It calls the internal function `__get_heap` with 3 parameters: * size of a type in bytes, which need be allocated -* `__alignof__(type)` shows how type of variable is aligned +* `__alignof__(type)` shows how variables of this type are aligned * `n` tells how many bytes to allocate Implementation of `__get_heap` is: @@ -567,7 +567,7 @@ That's all we're in the protected mode and stop at it's entry point. What happen Conclusion -------------------------------------------------------------------------------- -It is the end of the third part about linux kernel internals. In next part we will see first steps in the protected mode and transition into the [long mode](http://en.wikipedia.org/wiki/Long_mode). +This is the end of the third part about linux kernel internals. In next part we will see first steps in the protected mode and transition into the [long mode](http://en.wikipedia.org/wiki/Long_mode). If you have any questions or suggestions write me a comment or ping me at [twitter](https://twitter.com/0xAX). diff --git a/Booting/linux-bootstrap-5.md b/Booting/linux-bootstrap-5.md index 5e0c90e..a94ee12 100644 --- a/Booting/linux-bootstrap-5.md +++ b/Booting/linux-bootstrap-5.md @@ -154,7 +154,7 @@ Note that there is `std` instruction before data copying, it sets `DF` flag and In the end we clear `DF` flag with `cld` instruction and restore `boot_params` structure to the `rsi`. -After it we get `.text` section address address and jump to it: +After it we get `.text` section address and jump to it: ```assembly leaq relocated(%rbx), %rax