From b2153dd619c8c962663f832cb31dd9c20d1fdc10 Mon Sep 17 00:00:00 2001 From: Helge Wagner Date: Tue, 29 Apr 2008 14:20:40 +0200 Subject: [PATCH] --- yaml --- r: 96351 b: refs/heads/master c: 9096bd7a66efbe406910365c5206a32eed3875af h: refs/heads/master i: 96349: b4fa24b466f582a847cc1c5404b7f57830aa8692 96347: 9cb607ea4fa8460af0e30fa610bb9095c32cf362 96343: a3a99ef8b1468eacde5c821a7ebf1b72dc670371 96335: 444c54db0015fb02222d0ae0d1a0b4f18f8e7516 96319: efa4e8a944fd6bb2853ff6724a42ffcf85689b98 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup_32.c | 7 ++++++- trunk/arch/x86/kernel/setup_64.c | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 77fc19027dd8..6e65ae056ef3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd3c3ed5d1e3ceb37635cbe6d220ab94aae0781d +refs/heads/master: 9096bd7a66efbe406910365c5206a32eed3875af diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c index 2283422af794..2c5f8b213e86 100644 --- a/trunk/arch/x86/kernel/setup_32.c +++ b/trunk/arch/x86/kernel/setup_32.c @@ -127,7 +127,12 @@ static struct resource standard_io_resources[] = { { }, { .name = "keyboard", .start = 0x0060, - .end = 0x006f, + .end = 0x0060, + .flags = IORESOURCE_BUSY | IORESOURCE_IO +}, { + .name = "keyboard", + .start = 0x0064, + .end = 0x0064, .flags = IORESOURCE_BUSY | IORESOURCE_IO }, { .name = "dma page reg", diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c index 80d80fab7006..f2fc8feb727d 100644 --- a/trunk/arch/x86/kernel/setup_64.c +++ b/trunk/arch/x86/kernel/setup_64.c @@ -129,7 +129,9 @@ static struct resource standard_io_resources[] = { .flags = IORESOURCE_BUSY | IORESOURCE_IO }, { .name = "timer1", .start = 0x50, .end = 0x53, .flags = IORESOURCE_BUSY | IORESOURCE_IO }, - { .name = "keyboard", .start = 0x60, .end = 0x6f, + { .name = "keyboard", .start = 0x60, .end = 0x60, + .flags = IORESOURCE_BUSY | IORESOURCE_IO }, + { .name = "keyboard", .start = 0x64, .end = 0x64, .flags = IORESOURCE_BUSY | IORESOURCE_IO }, { .name = "dma page reg", .start = 0x80, .end = 0x8f, .flags = IORESOURCE_BUSY | IORESOURCE_IO },