rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.24, 1.25 linux-2.6-xen.patch, 1.3, 1.4

[Juan Quintela (quintela)]

Author: quintela

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

Modified Files:
	kernel-xen.spec linux-2.6-xen.patch 
Log Message:
- sync irq/manage.c with upstream (Markus).
- correctly init smpboot.c for xen (Chris Wright).
- pop %gs is a 2 bytes opcode (sct).
>VS: ----------------------------------------------------------------------



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kernel-xen.spec	8 May 2007 07:29:55 -0000	1.24
+++ kernel-xen.spec	10 May 2007 21:01:10 -0000	1.25
@@ -2011,6 +2011,11 @@
 #  - tux.
 
 %changelog
+* Thu May 10 2007  <quintela at redhat.com>
+- sync irq/manage.c with upstream (Markus).
+- correctly init smpboot.c for xen (Chris Wright).
+- pop %gs is a 2 bytes opcode (sct).
+
 * Tue May  8 2007  <quintela at redhat.com>
 - Disable kvm on xen kernels
 

linux-2.6-xen.patch:

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-xen.patch	22 Mar 2007 15:40:59 -0000	1.3
+++ linux-2.6-xen.patch	10 May 2007 21:01:10 -0000	1.4
@@ -2941,7 +2941,7 @@
 +	.byte 0x18			# pop  %eax
 +	.byte 0x1c			# pop  %ds
 +	.byte 0x20			# pop  %es
-+	.byte 0x24			# pop  %gs
++	.byte 0x24,0x24			# pop  %gs
 +	.byte 0x28,0x28,0x28		# add  $4,%esp
 +	.byte 0x2c			# iret
 +	.byte 0xff,0xff,0xff,0xff	# movb $1,1(%esi)
@@ -54848,7 +54848,7 @@
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff /scratch/src/linux-2.6.20.3/drivers/xen/core/smpboot.c source/drivers/xen/core/smpboot.c
 --- /scratch/src/linux-2.6.20.3/drivers/xen/core/smpboot.c	1970-01-01 01:00:00.000000000 +0100
 +++ source/drivers/xen/core/smpboot.c	2007-03-20 21:26:49.000000000 +0100
-@@ -0,0 +1,501 @@
+@@ -0,0 +1,503 @@
 +/*
 + *	Xen SMP booting functions
 + *
@@ -55182,7 +55182,9 @@
 +			       cpu);
 +			continue;
 +		}
++		memset(pda, 0, sizeof(*pda));
 +		cpu_pda(cpu) = pda;
++		pda->|_pda = pda;
 +		cpu_pda(cpu)->cpu_number = cpu;
 +		pack_descriptor((u32 *)&gdt[GDT_ENTRY_PDA].a,
 +				(u32 *)&gdt[GDT_ENTRY_PDA].b,
@@ -94436,25 +94438,6 @@
  	retval = 0;
  out:
  	up_write(&mm->mmap_sem);
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff /scratch/src/linux-2.6.20.3/kernel/irq/manage.c source/kernel/irq/manage.c
---- /scratch/src/linux-2.6.20.3/kernel/irq/manage.c	2007-02-04 19:44:54.000000000 +0100
-+++ source/kernel/irq/manage.c	2007-03-21 14:49:46.000000000 +0100
-@@ -30,6 +30,7 @@ void synchronize_irq(unsigned int irq)
- {
- 	struct irq_desc *desc = irq_desc + irq;
- 
-+	WARN_ON(in_interrupt());
- 	if (irq >= NR_IRQS)
- 		return;
- 
-@@ -358,7 +359,6 @@ void free_irq(unsigned int irq, void *de
- 	struct irqaction **p;
- 	unsigned long flags;
- 
--	WARN_ON(in_interrupt());
- 	if (irq >= NR_IRQS)
- 		return;
- 
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff /scratch/src/linux-2.6.20.3/kernel/Kconfig.preempt source/kernel/Kconfig.preempt
 --- /scratch/src/linux-2.6.20.3/kernel/Kconfig.preempt	2007-02-04 19:44:54.000000000 +0100
 +++ source/kernel/Kconfig.preempt	2007-03-20 21:27:04.000000000 +0100