rpms/kernel/devel linux-2.6-x86-debug-boot.patch, NONE, 1.1 kernel.spec, 1.34, 1.35

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-debug-boot.patch 
Log Message:
* Fri Jul 27 2007 Chuck Ebbert <cebbert at redhat.com>
- temporarily added debug messages for x86 bootup


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

--- NEW FILE linux-2.6-x86-debug-boot.patch ---
---
 arch/i386/boot/main.c |    6 ++++++
 arch/i386/boot/pm.c   |    6 ++++++
 2 files changed, 12 insertions(+)

--- 2.6.23-rc1-git3.orig/arch/i386/boot/main.c
+++ 2.6.23-rc1-git3/arch/i386/boot/main.c
@@ -137,25 +137,31 @@ void main(void)
 	set_video();
 
 	/* Query MCA information */
+	puts("query_mca\n");
 	query_mca();
 
 	/* Voyager */
 #ifdef CONFIG_X86_VOYAGER
+	puts("query_voyager\n");
 	query_voyager();
 #endif
 
+	puts("query_ist\n");
 	/* Query Intel SpeedStep (IST) information */
 	query_ist();
 
 	/* Query APM information */
 #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+	puts("query_apm_bios\n");
 	query_apm_bios();
 #endif
 
 	/* Query EDD information */
 #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
+	puts("query_edd\n");
 	query_edd();
 #endif
 	/* Do the last things and invoke protected mode */
+	puts("go_to_protected_mode\n");
 	go_to_protected_mode();
 }
--- 2.6.23-rc1-git3.orig/arch/i386/boot/pm.c
+++ 2.6.23-rc1-git3/arch/i386/boot/pm.c
@@ -145,24 +145,30 @@ static void setup_idt(void)
 void go_to_protected_mode(void)
 {
 	/* Hook before leaving real mode, also disables interrupts */
+	puts("realmode_switch_hook\n");
 	realmode_switch_hook();
 
 	/* Move the kernel/setup to their final resting places */
+	puts("move_kernel_around\n");
 	move_kernel_around();
 
 	/* Enable the A20 gate */
+	puts("enable_a20\n");
 	if (enable_a20()) {
 		puts("A20 gate not responding, unable to boot...\n");
 		die();
 	}
 
 	/* Reset coprocessor (IGNNE#) */
+	puts("reset_coprocessor\n");
 	reset_coprocessor();
 
 	/* Mask all interrupts in the PIC */
+	puts("mask_all_interrupts\n");
 	mask_all_interrupts();
 
 	/* Actual transition to protected mode... */
+	puts("transition to PM...\n");
 	setup_idt();
 	setup_gdt();
 	protected_mode_jump(boot_params.hdr.code32_start,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kernel.spec	27 Jul 2007 17:58:01 -0000	1.34
+++ kernel.spec	27 Jul 2007 19:16:59 -0000	1.35
@@ -515,6 +515,8 @@
 
 %if !%{nopatches}
 
+Patch20: linux-2.6-x86-debug-boot.patch
+
 Patch21: linux-2.6-utrace-tracehook.patch
 Patch22: linux-2.6-utrace-tracehook-ia64.patch
 Patch23: linux-2.6-utrace-tracehook-sparc64.patch
@@ -1036,6 +1038,9 @@
 #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
+
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
 ApplyPatch linux-2.6-utrace-tracehook.patch
@@ -2129,6 +2134,9 @@
 
 %changelog
 * Fri Jul 27 2007 Chuck Ebbert <cebbert at redhat.com>
+- temporarily added debug messages for x86 bootup
+
+* Fri Jul 27 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc1-git4
 
 * Thu Jul 26 2007 Chuck Ebbert <cebbert at redhat.com>