Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1071-2.6.25-xen-Disable-apic-at-compile-time-FIXME.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 606 - (show annotations) (download)
Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
File size: 804 byte(s)
-ver bump to 2.6.25-magellan-r1:
- linux-2.6.25.4
- fbcondecor-0.9.4
- squashfs-3.3
- unionfs-2.3.3
- tuxonice-3.0-rc7
- linux-phc-0.3.0
- acpi-dstd-0.9a
- reiser4
- xen-3.2.0
. ipw3945-1.2.2

1 From c213656eba75f9111cb3add510882a5fd0c57fdd Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Tue, 18 Dec 2007 16:54:43 -0200
4 Subject: [PATCH] Disable apic at compile time (FIXME)
5
6 More code that will need to be disabled at runtime.
7
8 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
9 ---
10 arch/x86/kernel/setup_64.c | 3 +++
11 1 files changed, 3 insertions(+), 0 deletions(-)
12
13 diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
14 index f4f7ecf..e81261a 100644
15 --- a/arch/x86/kernel/setup_64.c
16 +++ b/arch/x86/kernel/setup_64.c
17 @@ -444,7 +444,10 @@ void __init setup_arch(char **cmdline_p)
18 */
19 if (smp_found_config)
20 get_smp_config();
21 +#ifndef CONFIG_XEN
22 + /*FIXME: pvops */
23 init_apic_mappings();
24 +#endif
25 ioapic_init_mappings();
26
27 /*
28 --
29 1.5.4.1
30