rpms/kernel-xen-2.6/devel Makefile, 1.8, 1.9 Makefile.config, 1.8, 1.9 linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, 1.2, 1.3

[Mark McLoughlin (markmc)]

Author: markmc

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2091

Modified Files:
	Makefile Makefile.config 
	linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch 
Log Message:
Another build fix






linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch:

Index: linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch	1 Apr 2008 12:52:48 -0000	1.2
+++ linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch	1 Apr 2008 13:07:21 -0000	1.3
@@ -1,4 +1,4 @@
-From 42d111eabbcc4a561cacb15c67b83d2a2a52f16e Mon Sep 17 00:00:00 2001
+From 880992833dbeb5d6b97cf0aeb6993e3eef2df045 Mon Sep 17 00:00:00 2001
 From: Eduardo Habkost <ehabkost at redhat.com>
 Date: Thu, 28 Feb 2008 12:16:04 -0300
 Subject: [PATCH] xen x86_64: Initial x86_64 support for Xen paravirt_ops
@@ -40,7 +40,7 @@
  arch/x86/vdso/vdso32-setup.c         |    6 +-
  arch/x86/xen/Kconfig                 |    1 -
  arch/x86/xen/Makefile                |    6 +
- arch/x86/xen/enlighten.c             |  266 +++++++++++------
+ arch/x86/xen/enlighten.c             |  268 +++++++++++------
  arch/x86/xen/entry.S                 |    5 +
  arch/x86/xen/entry_32.S              |   81 +++++
  arch/x86/xen/entry_64.S              |   68 ++++
@@ -88,7 +88,7 @@
  include/xen/page.h                   |   34 ++-
  init/main.c                          |   10 +
  mm/slab.c                            |    8 +-
- 80 files changed, 2768 insertions(+), 673 deletions(-)
+ 80 files changed, 2769 insertions(+), 674 deletions(-)
  create mode 100644 arch/x86/xen/entry.S
  create mode 100644 arch/x86/xen/entry_32.S
  create mode 100644 arch/x86/xen/entry_64.S
@@ -1898,7 +1898,7 @@
 +
  obj-$(CONFIG_SMP)	+= smp.o
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 5c91ae7..53ee6ac 100644
+index 5c91ae7..eff8aae 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -36,6 +36,7 @@
@@ -1943,6 +1943,15 @@
  }
  
  static void __init xen_banner(void)
+@@ -143,7 +153,7 @@ static void __init xen_banner(void)
+ 	printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic);
+ }
+ 
+-static void kcons_write_dom0(const char *s, unsigned int count)
++void kcons_write_dom0(const char *s, unsigned int count)
+ {
+        int rc;
+ 
 @@ -388,6 +398,7 @@ static void xen_load_tls(struct thread_struct *t, unsigned int cpu)
  
  	xen_mc_issue(PARAVIRT_LAZY_CPU);