Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1033-2.6.25-xen-x86_64-Use-x86_read_percpu-only-to-refer-to-a.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: 954 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 93e241b49359a21701d1df0a9bea5ee6e3d6d3d5 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@Rawhide-64.localdomain>
3 Date: Tue, 27 Nov 2007 19:25:50 -0200
4 Subject: [PATCH] xen x86_64: Use x86_read_percpu() only to refer to a variable name
5
6 Our x86_read_percpu() implementation doesn't handle struct
7 dereferences.
8
9 Signed-off-by: Eduardo Habkost <ehabkost@Rawhide-64.localdomain>
10 ---
11 arch/x86/xen/enlighten.c | 4 ++++
12 1 files changed, 4 insertions(+), 0 deletions(-)
13
14 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
15 index bcb8835..c1debed 100644
16 --- a/arch/x86/xen/enlighten.c
17 +++ b/arch/x86/xen/enlighten.c
18 @@ -625,7 +625,11 @@ static unsigned long xen_read_cr2(void)
19
20 static unsigned long xen_read_cr2_direct(void)
21 {
22 +#ifdef CONFIG_X86_32
23 return x86_read_percpu(xen_vcpu_info.arch.cr2);
24 +#else
25 + return x86_read_percpu(xen_vcpu_info).arch.cr2;
26 +#endif
27 }
28
29 static void xen_write_cr4(unsigned long cr4)
30 --
31 1.5.4.1
32