rpms/kernel/devel linux-2.6-x86-setup-edd.patch, NONE, 1.1 kernel.spec, 1.42, 1.43 linux-2.6-x86-debug-boot.patch, 1.1, NONE

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-setup-edd.patch 
Removed Files:
	linux-2.6-x86-debug-boot.patch 
Log Message:
* Tue Jul 31 2007 Chuck Ebbert <cebbert at redhat.com>
- fix boot from CD and remove debug patch


linux-2.6-x86-setup-edd.patch:

--- NEW FILE linux-2.6-x86-setup-edd.patch ---
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c
index 25a2824..7e97d86 100644
--- a/arch/i386/boot/edd.c
+++ b/arch/i386/boot/edd.c
@@ -72,7 +72,6 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei)
 	u32 mbrsig;
 	u32 buf_base, mbr_base;
 	extern char _end[];
-	static char mbr_buf[1024];
 
 	sector_size = ei->params.bytes_per_sector;
 	if (!sector_size)
@@ -80,7 +79,7 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei)
 
 	buf_base = (ds() << 4) + (u32)&_end;
 	mbr_base = (buf_base+sector_size-1) & ~(sector_size-1);
-	mbrbuf_ptr = mbr_buf + (mbr_base-buf_base);
+	mbrbuf_ptr = _end + (mbr_base-buf_base);
 	mbrbuf_end = mbrbuf_ptr + sector_size;
 
 	if (!(boot_params.hdr.loadflags & CAN_USE_HEAP))


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kernel.spec	31 Jul 2007 19:48:41 -0000	1.42
+++ kernel.spec	31 Jul 2007 20:23:18 -0000	1.43
@@ -515,7 +515,7 @@
 
 %if !%{nopatches}
 
-Patch20: linux-2.6-x86-debug-boot.patch
+Patch20: linux-2.6-x86-setup-edd.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
 Patch22: linux-2.6-utrace-tracehook-ia64.patch
@@ -1049,8 +1049,8 @@
 #ApplyPatch linux-2.6-clockevents-fix-resume-logic.patch
 #ApplyPatch linux-2.6-highres-timers.patch
 
-# print debug messages during real-mode x86 boot
-ApplyPatch linux-2.6-x86-debug-boot.patch
+# fix boot from CD
+ApplyPatch linux-2.6-x86-setup-edd.patch
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
@@ -2162,6 +2162,9 @@
 %endif
 
 %changelog
+* Tue Jul 31 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix boot from CD and remove debug patch
+
 * Tue Jul 31 2007 David Woodhouse <dwmw2 at infradead.org>
 - Fix PS3 booting (spu init breakage)
 


--- linux-2.6-x86-debug-boot.patch DELETED ---