/[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1085-2.6.25-xen-Make-arch_vcpu_info-be-of-the-right-size-on-both-32.patch |
Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1085-2.6.25-xen-Make-arch_vcpu_info-be-of-the-right-size-on-both-32.patch
Parent Directory | Revision Log
Revision 606 -
(show annotations)
(download)
Thu May 22 23:13:13 2008 UTC (16 years, 1 month ago) by niro
File size: 1022 byte(s)
Thu May 22 23:13:13 2008 UTC (16 years, 1 month ago) by niro
File size: 1022 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 a607a4a684f04787f4be79a400bd6745be4bcf58 Mon Sep 17 00:00:00 2001 |
2 | From: Eduardo Habkost <ehabkost@redhat.com> |
3 | Date: Thu, 27 Dec 2007 17:33:32 -0200 |
4 | Subject: [PATCH] Make arch_vcpu_info be of the right size on both 32 and 64 bits |
5 | |
6 | Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> |
7 | --- |
8 | include/asm-x86/xen/interface.h | 12 ++++++++++-- |
9 | 1 files changed, 10 insertions(+), 2 deletions(-) |
10 | |
11 | diff --git a/include/asm-x86/xen/interface.h b/include/asm-x86/xen/interface.h |
12 | index 881d1b3..ab69adb 100644 |
13 | --- a/include/asm-x86/xen/interface.h |
14 | +++ b/include/asm-x86/xen/interface.h |
15 | @@ -171,8 +171,16 @@ struct arch_shared_info { |
16 | }; |
17 | |
18 | struct arch_vcpu_info { |
19 | - unsigned long cr2; |
20 | - unsigned long pad[5]; /* sizeof(struct vcpu_info) == 64 */ |
21 | + union { |
22 | + struct { |
23 | + /* The "real" struct */ |
24 | + unsigned long cr2; |
25 | + }; |
26 | + struct { |
27 | + /* force struct size to 16 bytes */ |
28 | + char fill[16]; |
29 | + }; |
30 | + }; |
31 | }; |
32 | |
33 | #endif /* !__ASSEMBLY__ */ |
34 | -- |
35 | 1.5.4.1 |
36 |