Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1043-2.6.25-xen-Chainsaw-ifdefs-on-assembly-percpu-handling.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: 1086 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 83434296ebd545e4342c89aed7113274c63a36fe Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Wed, 28 Nov 2007 17:55:00 -0200
4 Subject: [PATCH] Chainsaw-ifdefs on assembly percpu handling
5
6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
7
8 Undo stupid code added when trying to make percpu work
9
10 Using 32-bit registers would never work.
11
12 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
13 ---
14 include/asm-x86/percpu.h | 4 ++++
15 1 files changed, 4 insertions(+), 0 deletions(-)
16
17 diff --git a/include/asm-x86/percpu.h b/include/asm-x86/percpu.h
18 index b80af66..5dcb3bd 100644
19 --- a/include/asm-x86/percpu.h
20 +++ b/include/asm-x86/percpu.h
21 @@ -9,6 +9,8 @@
22 should be just put into a single section and referenced directly
23 from %gs */
24
25 +#ifndef __ASSEMBLY__
26 +
27 #ifdef CONFIG_SMP
28 #include <asm/pda.h>
29
30 @@ -26,6 +28,8 @@ DECLARE_PER_CPU(struct x8664_pda, pda);
31 #define x86_read_percpu(var) __get_cpu_var(var)
32 #define x86_write_percpu(var,val) (__get_cpu_var(var) = (val))
33
34 +#endif
35 +
36 #else /* CONFIG_X86_64 */
37
38 #ifdef __ASSEMBLY__
39 --
40 1.5.4.1
41