Skip to content

L
linux
Commit 3c28f6b7 authored by James Bottomley's avatar James Bottomley
Browse files
Options

Merge by hand

parent 76774cfc
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
arch/i386/kernel/reboot.c
View file @ 3c28f6b7
...@@ -198,11 +198,6 @@ void machine_real_restart(unsigned char *code, int length) ...@@ -198,11 +198,6 @@ void machine_real_restart(unsigned char *code, int length)
memcpy (swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS, memcpy (swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
sizeof (swapper_pg_dir [0]) * KERNEL_PGD_PTRS); sizeof (swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
/* Make sure the first page is mapped to the start of physical memory.
It is normally not mapped, to trap kernel NULL pointer dereferences. */
pg0[0] = _PAGE_RW | _PAGE_PRESENT;
/* /*
* Use `swapper_pg_dir' as our page directory. * Use `swapper_pg_dir' as our page directory.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7