Magellan Linux

Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1047-2.6.25-xen-asm.S-x86_64-notes.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: 1153 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 5ff57341c0b638831bfd91801142310f9206a5e6 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Tue, 4 Dec 2007 14:43:21 -0200
4 Subject: [PATCH] xen-asm.S: x86_64 notes
5
6 - Point to right entrypoint (startup_xen)
7 - Point to hypercall_page
8
9 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
10 ---
11 arch/x86/xen/xen-head.S | 3 ++-
12 1 files changed, 2 insertions(+), 1 deletions(-)
13
14 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
15 index ec5d622..429e8f3 100644
16 --- a/arch/x86/xen/xen-head.S
17 +++ b/arch/x86/xen/xen-head.S
18 @@ -33,9 +33,10 @@ ENTRY(hypercall_page)
19 ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen)
20 ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page)
21 #else
22 + ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .quad startup_xen)
23 + ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .quad hypercall_page)
24 ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, .quad __START_KERNEL_map)
25 ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET, .quad 0)
26 - ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .quad startup_64)
27 ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, .quad _PAGE_PRESENT,_PAGE_PRESENT)
28 #endif
29
30 --
31 1.5.4.1
32