lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/setup' into x86/devel

Browse Source
This commit is contained in:
Ingo Molnar
2008-07-08 09:43:01 +02:00
parent 6924d1ab8b 6bcb13b35a
commit 3c1ca43faf
20 changed files with 210 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/boot/a20.c
View File

@@ -1,7 +1,7 @@
/* -*- linux-c -*- ------------------------------------------------------- *
*
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright 2007 rPath, Inc. - All Rights Reserved
* Copyright 2007-2008 rPath, Inc. - All Rights Reserved
*
* This file is part of the Linux kernel, and is made available under
* the terms of the GNU General Public License version 2.
@@ -95,6 +95,9 @@ static void enable_a20_kbc(void)
outb(0xdf, 0x60); /* A20 on */
empty_8042();
outb(0xff, 0x64); /* Null command, but UHCI wants it */
empty_8042();
}
static void enable_a20_fast(void)