]>
Commit | Line | Data |
---|---|---|
cc90b958 BS |
1 | From: Greg Kroah-Hartman <gregkh@suse.de> |
2 | Subject: Linux 2.6.27.2 | |
3 | ||
4 | Upstream 2.6.27.2 release from kernel.org | |
5 | ||
6 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
7 | ||
8 | Automatically created from "patches.kernel.org/patch-2.6.27.1-2" by xen-port-patches.py | |
9 | ||
10 | Index: head-2008-11-25/arch/x86/kernel/io_apic_32-xen.c | |
11 | =================================================================== | |
12 | --- head-2008-11-25.orig/arch/x86/kernel/io_apic_32-xen.c 2008-11-25 14:37:19.000000000 +0100 | |
13 | +++ head-2008-11-25/arch/x86/kernel/io_apic_32-xen.c 2008-11-25 14:37:27.000000000 +0100 | |
14 | @@ -2381,6 +2381,9 @@ void __init setup_IO_APIC(void) | |
15 | /* Reserve all the system vectors. */ | |
16 | for (i = first_system_vector; i < NR_VECTORS; i++) | |
17 | set_bit(i, used_vectors); | |
18 | + | |
19 | + /* Mark FIRST_DEVICE_VECTOR which is assigned to IRQ0 as used. */ | |
20 | + set_bit(FIRST_DEVICE_VECTOR, used_vectors); | |
21 | #endif | |
22 | ||
23 | enable_IO_APIC(); | |
24 | Index: head-2008-11-25/arch/x86/mm/ioremap-xen.c | |
25 | =================================================================== | |
26 | --- head-2008-11-25.orig/arch/x86/mm/ioremap-xen.c 2008-11-27 09:34:01.000000000 +0100 | |
27 | +++ head-2008-11-25/arch/x86/mm/ioremap-xen.c 2008-11-27 09:36:21.000000000 +0100 | |
28 | @@ -784,7 +784,7 @@ void __init *early_ioremap(unsigned long | |
29 | */ | |
30 | offset = phys_addr & ~PAGE_MASK; | |
31 | phys_addr &= PAGE_MASK; | |
32 | - size = PAGE_ALIGN(last_addr) - phys_addr; | |
33 | + size = PAGE_ALIGN(last_addr + 1) - phys_addr; | |
34 | ||
35 | /* | |
36 | * Mappings have to fit in the FIX_BTMAP area. |