Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1080-2.6.25-xen_convert_trap_info-use-sizeof-struct-gate_desc.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: 871 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 63fe931b9f21fc2c810ff0aa31a12aed0bf22d3c Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Thu, 20 Dec 2007 16:45:51 -0200
4 Subject: [PATCH] xen_convert_trap_info(): use sizeof(struct gate_desc)
5
6 This will make it consider the corect size depending on the architecture.
7
8 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
9 ---
10 arch/x86/xen/enlighten.c | 2 +-
11 1 files changed, 1 insertions(+), 1 deletions(-)
12
13 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
14 index 49f895c..fea52b0 100644
15 --- a/arch/x86/xen/enlighten.c
16 +++ b/arch/x86/xen/enlighten.c
17 @@ -474,7 +474,7 @@ static void xen_convert_trap_info(const struct desc_ptr *desc,
18 {
19 unsigned in, out, count;
20
21 - count = (desc->size+1) / 8;
22 + count = (desc->size+1) / sizeof(gate_desc);
23 BUG_ON(count > 256);
24
25 for (in = out = 0; in < count; in++) {
26 --
27 1.5.4.1
28