rpms/kernel/devel kernel-2.6.spec, 1.1238, 1.1239 linux-2.6.9-xen-compile.patch, 1.35, 1.36

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 13 12:37:01 UTC 2005


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

Modified Files:
	kernel-2.6.spec linux-2.6.9-xen-compile.patch 
Log Message:
move loaddebug define into processor.h & use i386 signal.c


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1238
retrieving revision 1.1239
diff -u -r1.1238 -r1.1239
--- kernel-2.6.spec	13 Apr 2005 02:43:47 -0000	1.1238
+++ kernel-2.6.spec	13 Apr 2005 12:36:58 -0000	1.1239
@@ -6,10 +6,10 @@
 %define FC3 0
 %define FC4 1
 
-%define buildup 1
-%define buildsmp 1
+%define buildup 0
+%define buildsmp 0
 %if %{FC4}
-%define includexen 0
+%define includexen 1
 %endif
 %define builddoc 0
 

linux-2.6.9-xen-compile.patch:
 linux-2.6.10/arch/xen/i386/pci/irq.c                              |    1 
 linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h |    2 
 linux-2.6.11/arch/xen/Kconfig                                     |    2 
 linux-2.6.11/arch/xen/i386/kernel/Makefile                        |    6 
 linux-2.6.11/arch/xen/i386/kernel/i386_ksyms.c                    |    5 
 linux-2.6.11/arch/xen/i386/kernel/irq.c                           |    5 
 linux-2.6.11/arch/xen/i386/kernel/process.c                       |    9 -
 linux-2.6.11/arch/xen/i386/kernel/putuser.S                       |   87 ++++++++++
 linux-2.6.11/arch/xen/i386/kernel/time.c                          |   45 ++++-
 linux-2.6.11/arch/xen/i386/pci/irq.c                              |    4 
 linux-2.6.11/drivers/char/mem.c                                   |    2 
 linux-2.6.11/drivers/char/tty_io.c                                |    2 
 linux-2.6.11/include/asm-generic/pgtable.h                        |    1 
 linux-2.6.11/include/asm-xen/asm-i386/pgtable.h                   |   19 +-
 linux-2.6.11/include/asm-xen/asm-i386/processor.h                 |   20 ++
 linux-2.6.11/mm/memory.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/include/asm-i386/irq.h                                |    4 
 linux-2.6.9/kernel/profile.c                                      |    1 
 22 files changed, 194 insertions(+), 35 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- linux-2.6.9-xen-compile.patch	13 Apr 2005 03:03:24 -0000	1.35
+++ linux-2.6.9-xen-compile.patch	13 Apr 2005 12:36:58 -0000	1.36
@@ -481,3 +481,50 @@
  /*
   * CPUID functions returning a single datum
   */
+--- linux-2.6.11/arch/xen/i386/kernel/Makefile.12rc2	2005-04-13 00:03:25.000000000 -0400
++++ linux-2.6.11/arch/xen/i386/kernel/Makefile	2005-04-13 00:04:33.000000000 -0400
+@@ -8,11 +8,11 @@ CFLAGS	+= -Iarch/$(XENARCH)/kernel
+ 
+ extra-y := head.o init_task.o
+ 
+-obj-y	:= process.o signal.o entry.o traps.o \
++obj-y	:= process.o entry.o traps.o \
+ 		time.o ioport.o ldt.o setup.o \
+ 		pci-dma.o i386_ksyms.o irq.o putuser.o
+ 
+-c-obj-y	:= semaphore.o vm86.o \
++c-obj-y	:= semaphore.o vm86.o signal.o \
+ 		ptrace.o sys_i386.o \
+ 		i387.o dmi_scan.o bootflag.o \
+ 		doublefault.o quirks.o
+--- linux-2.6.11/include/asm-xen/asm-i386/processor.h.12rc2	2005-04-13 06:25:26.000000000 -0400
++++ linux-2.6.11/include/asm-xen/asm-i386/processor.h	2005-04-13 06:26:57.000000000 -0400
+@@ -514,6 +514,12 @@ static inline void load_esp0(struct tss_
+ 	load_user_cs_desc(smp_processor_id(), current->mm);	\
+ } while (0)
+ 
++/*
++ * This special macro can be used to load a debugging register
++ */
++#define loaddebug(thread,register) \
++	HYPERVISOR_set_debugreg(register, (thread)->debugreg[register])
++
+ /* Forward declaration, a strange C thing */
+ struct task_struct;
+ struct mm_struct;
+--- linux-2.6.11/arch/xen/i386/kernel/process.c.12rc2	2005-04-13 06:38:32.000000000 -0400
++++ linux-2.6.11/arch/xen/i386/kernel/process.c	2005-04-13 06:38:42.000000000 -0400
+@@ -462,13 +462,6 @@ int dump_task_regs(struct task_struct *t
+ }
+ 
+ /*
+- * This special macro can be used to load a debugging register
+- */
+-#define loaddebug(thread,register) \
+-		HYPERVISOR_set_debugreg((register),	\
+-			(thread->debugreg[register]))
+-
+-/*
+  *	switch_to(x,yn) should switch tasks from x to y.
+  *
+  * We fsave/fwait so that an exception goes off at the right time




More information about the fedora-cvs-commits mailing list