Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1058-2.6.25-xen-Avoid-using-mk_unsigned_long.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: 1432 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 11ece57847ef88e0c8b0a274cb1e0515b8ef3529 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Tue, 11 Dec 2007 16:06:14 -0200
4 Subject: [PATCH] Avoid using mk_unsigned_long()
5
6 This is just to avoid diving into the header file mess to make
7 the macro available.
8
9 The constants aren't used on assembly code, anyway, so just append
10 UL to them.
11
12 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
13 ---
14 include/asm-x86/xen/interface.h | 8 ++++----
15 1 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/include/asm-x86/xen/interface.h b/include/asm-x86/xen/interface.h
18 index 563074c..881d1b3 100644
19 --- a/include/asm-x86/xen/interface.h
20 +++ b/include/asm-x86/xen/interface.h
21 @@ -73,17 +73,17 @@ DEFINE_GUEST_HANDLE(void);
22 * machine->physical mapping table starts at this address, read-only.
23 */
24 #ifdef CONFIG_X86_64
25 -#define __HYPERVISOR_VIRT_START 0xFFFF800000000000
26 +#define __HYPERVISOR_VIRT_START 0xFFFF800000000000UL
27 #else
28 # ifdef CONFIG_X86_PAE
29 -# define __HYPERVISOR_VIRT_START 0xF5800000
30 +# define __HYPERVISOR_VIRT_START 0xF5800000UL
31 # else
32 -# define __HYPERVISOR_VIRT_START 0xFC000000
33 +# define __HYPERVISOR_VIRT_START 0xFC000000UL
34 # endif
35 #endif
36
37 #ifndef HYPERVISOR_VIRT_START
38 -#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START)
39 +#define HYPERVISOR_VIRT_START __HYPERVISOR_VIRT_START
40 #endif
41
42 #ifndef machine_to_phys_mapping
43 --
44 1.5.4.1
45