rpms/kernel/devel linux-2.6.9-xen-compile.patch,1.50,1.51

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Aug 24 03:48:44 UTC 2005


Author: riel

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22502

Modified Files:
	linux-2.6.9-xen-compile.patch 
Log Message:
more 2.6.13 Xen bits

linux-2.6.9-xen-compile.patch:
 linux-2.6.10/arch/xen/i386/pci/irq.c                |    1 +
 linux-2.6.12/arch/i386/kernel/vmlinux.lds.S         |    4 ++--
 linux-2.6.12/arch/xen/i386/Kconfig                  |   11 +++++++++++
 linux-2.6.12/arch/xen/i386/kernel/i386_ksyms.c      |    8 +-------
 linux-2.6.12/arch/xen/i386/kernel/process.c         |    4 ++--
 linux-2.6.12/arch/xen/i386/kernel/setup.c           |    8 ++++++++
 linux-2.6.12/arch/xen/i386/kernel/signal.c          |    2 +-
 linux-2.6.12/arch/xen/i386/kernel/time.c            |    6 +-----
 linux-2.6.12/arch/xen/i386/kernel/traps.c           |    4 ++--
 linux-2.6.12/arch/xen/i386/mm/pgtable.c             |    2 +-
 linux-2.6.12/arch/xen/i386/pci/irq.c                |   17 +++++++++++------
 linux-2.6.12/arch/xen/kernel/reboot.c               |    6 ++++++
 linux-2.6.12/drivers/char/tty_io.c                  |   19 ++++++++++++-------
 linux-2.6.12/include/asm-i386/timex.h               |    2 ++
 linux-2.6.12/include/asm-xen/asm-i386/mmu_context.h |    4 +---
 linux-2.6.12/include/asm-xen/asm-i386/page.h        |    3 +++
 linux-2.6.12/include/asm-xen/asm-i386/pci.h         |    2 +-
 linux-2.6.12/include/asm-xen/asm-i386/ptrace.h      |    4 ++++
 linux-2.6.12/include/linux/skbuff.h                 |    6 ++++--
 linux-2.6.12/net/core/dev.c                         |    4 ++++
 linux-2.6.8/arch/xen/i386/kernel/time.c             |    2 +-
 linux-2.6.9/Makefile                                |    2 +-
 linux-2.6.9/arch/xen/Makefile                       |    3 +++
 linux-2.6.9/arch/xen/boot/Makefile                  |    3 +++
 linux-2.6.9/kernel/profile.c                        |    1 +
 25 files changed, 87 insertions(+), 41 deletions(-)

Index: linux-2.6.9-xen-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-xen-compile.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- linux-2.6.9-xen-compile.patch	24 Aug 2005 03:25:57 -0000	1.50
+++ linux-2.6.9-xen-compile.patch	24 Aug 2005 03:48:41 -0000	1.51
@@ -368,3 +368,74 @@
  
  
  #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
+--- linux-2.6.12/arch/xen/i386/kernel/process.c.2613	2005-08-23 20:32:31.000000000 -0400
++++ linux-2.6.12/arch/xen/i386/kernel/process.c	2005-08-23 20:32:48.000000000 -0400
+@@ -184,7 +184,7 @@
+  */
+ void cpu_idle (void)
+ {
+-	int cpu = _smp_processor_id();
++	int cpu = smp_processor_id();
+ 
+ 	/* endless idle loop with no priority at all */
+ 	while (1) {
+--- linux-2.6.12/arch/xen/i386/kernel/setup.c.2613	2005-08-23 20:35:09.000000000 -0400
++++ linux-2.6.12/arch/xen/i386/kernel/setup.c	2005-08-23 20:36:23.000000000 -0400
+@@ -58,6 +58,14 @@
+ #include "setup_arch_pre.h"
+ #include <bios_ebda.h>
+ 
++#ifdef CONFIG_HOTPLUG_CPU
++#define DEFAULT_SEND_IPI	(1)
++#else
++#define DEFAULT_SEND_IPI	(0)
++#endif
++
++int no_broadcast=DEFAULT_SEND_IPI;
++
+ /* Allows setting of maximum possible memory size  */
+ static unsigned long xen_override_max_pfn;
+ 
+--- linux-2.6.12/arch/xen/kernel/reboot.c.2613	2005-08-23 20:41:22.000000000 -0400
++++ linux-2.6.12/arch/xen/kernel/reboot.c	2005-08-23 20:42:16.000000000 -0400
+@@ -32,6 +32,12 @@
+ 	HYPERVISOR_reboot();
+ }
+ 
++void machine_emergency_restart(void)
++{
++	char dummy;
++	machine_restart(&dummy);
++}
++
+ void machine_halt(void)
+ {
+ 	machine_power_off();
+--- linux-2.6.12/include/asm-i386/timex.h.2613	2005-08-23 20:31:58.000000000 -0400
++++ linux-2.6.12/include/asm-i386/timex.h	2005-08-23 20:32:15.000000000 -0400
+@@ -49,7 +49,9 @@
+ 
+ extern unsigned int cpu_khz;
+ 
++#ifndef CONFIG_XEN
+ extern int read_current_timer(unsigned long *timer_value);
+ #define ARCH_HAS_READ_CURRENT_TIMER	1
++#endif
+ 
+ #endif
+--- linux-2.6.12/include/asm-xen/asm-i386/ptrace.h.2613	2005-08-23 20:37:02.000000000 -0400
++++ linux-2.6.12/include/asm-xen/asm-i386/ptrace.h	2005-08-23 20:38:09.000000000 -0400
+@@ -55,9 +55,13 @@
+ #define PTRACE_SET_THREAD_AREA    26
+ 
+ #ifdef __KERNEL__
++
++#include <asm/vm86.h>
++
+ struct task_struct;
+ extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code);
+ #define user_mode(regs) ((VM_MASK & (regs)->eflags) || (2 & (regs)->xcs))
++#define user_mode_vm(regs) (((regs->xcs & 3) | (regs->eflags & VM_MASK)) != 0)
+ #define instruction_pointer(regs) ((regs)->eip)
+ #if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER)
+ extern unsigned long profile_pc(struct pt_regs *regs);




More information about the fedora-cvs-commits mailing list