rpms/kernel/devel kernel.spec, 1.1294.2.31, 1.1294.2.32 xen.pvops.patch, 1.1.2.23, 1.1.2.24

[Michael Young]

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18203

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec xen.pvops.patch 
Log Message:
fix a pvops mismerge with 2.6.30-rc8



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.31
retrieving revision 1.1294.2.32
diff -u -p -r1.1294.2.31 -r1.1294.2.32
--- kernel.spec	4 Jun 2009 20:39:54 -0000	1.1294.2.31
+++ kernel.spec	4 Jun 2009 21:33:56 -0000	1.1294.2.32
@@ -1817,7 +1817,7 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
-* Thu Jun  4 2009 Michael Young <m.a.young at durham.ac.uk>
+* Thu Jun 04 2009 Michael Young <m.a.young at durham.ac.uk>
 - pvops update to 2.6.30-rc8
 
 * Wed Jun 03 2009 Kyle McMartin <kyle at redhat.com>

xen.pvops.patch:

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -p -r1.1.2.23 -r1.1.2.24
--- xen.pvops.patch	4 Jun 2009 19:34:58 -0000	1.1.2.23
+++ xen.pvops.patch	4 Jun 2009 21:33:56 -0000	1.1.2.24
@@ -19052,7 +19052,7 @@ index 911eaae..a95a531 100644
  	return 0;
  }
 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
-index 74b3d2b..82f6b2d 100644
+index 74b3d2b..cae3feb 100644
 --- a/arch/x86/boot/memory.c
 +++ b/arch/x86/boot/memory.c
 @@ -20,12 +20,16 @@
@@ -19101,7 +19101,7 @@ index 74b3d2b..82f6b2d 100644
  			break;
  
  		/* Some BIOSes stop returning SMAP in the middle of
-@@ -64,60 +59,70 @@ static int detect_memory_e820(void)
+@@ -64,60 +59,64 @@ static int detect_memory_e820(void)
  		   screwed up the map at that point, we might have a
  		   partial map, the full map, or complete garbage, so
  		   just return failure. */
@@ -19111,14 +19111,7 @@ index 74b3d2b..82f6b2d 100644
  			break;
  		}
  
--		*desc++ = buf;
-+		/* ACPI 3.0 added the extended flags support.  If bit 0
-+		   in the extended flags is zero, we're supposed to simply
-+		   ignore the entry -- a backwards incompatible change! */
-+		if (oreg.cx > 20 && !(buf.ext_flags & 1))
-+			continue;
-+
-+		*desc++ = buf.std;
+ 		*desc++ = buf;
  		count++;
 -	} while (next && count < ARRAY_SIZE(boot_params.e820_map));
 +	} while (ireg.ebx && count < ARRAY_SIZE(boot_params.e820_map));