Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1149-2.6.25-xen-Don-t-use-FIX_VDSO-on-64-bit.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 606 - (show annotations) (download)
Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
File size: 796 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 11ef587617951d5df1ecba7df4f66e71b9dfb761 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Mon, 3 Mar 2008 14:46:56 -0300
4 Subject: [PATCH] Don't use FIX_VDSO on 64-bit
5
6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
7 ---
8 arch/x86/xen/enlighten.c | 2 ++
9 1 files changed, 2 insertions(+), 0 deletions(-)
10
11 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
12 index 9c89197..98b78d4 100644
13 --- a/arch/x86/xen/enlighten.c
14 +++ b/arch/x86/xen/enlighten.c
15 @@ -1106,7 +1106,9 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)
16 case FIX_F00F_IDT:
17 #endif
18 case FIX_WP_TEST:
19 +#ifndef CONFIG_X86_64
20 case FIX_VDSO:
21 +#endif
22 #ifdef CONFIG_X86_LOCAL_APIC
23 case FIX_APIC_BASE: /* maps dummy local APIC */
24 #endif
25 --
26 1.5.4.1
27