rpms/kernel/devel kernel.spec, 1.152, 1.153 linux-2.6-x86-debug-boot.patch, 1.3, 1.4

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec linux-2.6-x86-debug-boot.patch 
Log Message:
* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
- x86: fix debug early boot



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kernel.spec	7 Sep 2007 18:32:07 -0000	1.152
+++ kernel.spec	10 Sep 2007 14:43:37 -0000	1.153
@@ -1802,6 +1802,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86: fix debug early boot
+
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86: debug early boot
 

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

Index: linux-2.6-x86-debug-boot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-debug-boot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-x86-debug-boot.patch	7 Sep 2007 18:32:07 -0000	1.3
+++ linux-2.6-x86-debug-boot.patch	10 Sep 2007 14:43:37 -0000	1.4
@@ -17,7 +17,7 @@
  	}
  
  	/* Make sure we have all the proper CPU support */
-+	puts("A");
++	putchar('A');
  	if (validate_cpu()) {
  		puts("Unable to boot - please use a kernel appropriate "
  		     "for your CPU.\n");
@@ -25,84 +25,80 @@
  	}
  
  	/* Tell the BIOS what CPU mode we intend to run in. */
-+	puts("B");
++	putchar('B');
  	set_bios_mode();
  
  	/* Detect memory layout */
-+	puts("C");
++	putchar('C');
  	detect_memory();
  
  	/* Set keyboard repeat rate (why?) */
-+	puts("D");
++	putchar('D');
  	keyboard_set_repeat();
  
  	/* Set the video mode */
-+	puts("E");
++	putchar('E');
  	set_video();
  
  	/* Query MCA information */
-+	puts("F");
++	putchar('F');
  	query_mca();
  
  	/* Voyager */
  #ifdef CONFIG_X86_VOYAGER
-+	puts("G");
++	putchar('G');
  	query_voyager();
  #endif
  
-+	puts("H");
++	putchar('H');
  	/* Query Intel SpeedStep (IST) information */
  	query_ist();
  
  	/* Query APM information */
  #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-+	puts("I");
++	putchar('I');
  	query_apm_bios();
  #endif
  
  	/* Query EDD information */
  #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
-+	puts("J");
++	putchar('J');
  	query_edd();
  #endif
  	/* Do the last things and invoke protected mode */
-+	puts("K");
++	putchar('K');
  	go_to_protected_mode();
  }
 --- linux-2.6.22.noarch.orig/arch/i386/boot/pm.c
 +++ linux-2.6.22.noarch/arch/i386/boot/pm.c
-@@ -145,26 +145,34 @@ static void setup_idt(void)
+@@ -145,24 +145,30 @@ static void setup_idt(void)
  void go_to_protected_mode(void)
  {
  	/* Hook before leaving real mode, also disables interrupts */
-+	puts("L");
++	putchar('L');
  	realmode_switch_hook();
  
  	/* Move the kernel/setup to their final resting places */
-+	puts("M");
++	putchar('M');
  	move_kernel_around();
  
  	/* Enable the A20 gate */
-+	puts("N");
++	putchar('N');
  	if (enable_a20()) {
  		puts("A20 gate not responding, unable to boot...\n");
  		die();
  	}
  
  	/* Reset coprocessor (IGNNE#) */
-+	puts("O");
++	putchar('O');
  	reset_coprocessor();
  
  	/* Mask all interrupts in the PIC */
-+	puts("P");
++	putchar('P');
  	mask_all_interrupts();
  
  	/* Actual transition to protected mode... */
-+	puts("Q");
++	puts("Q\n");
  	setup_idt();
-+	puts("R");
  	setup_gdt();
-+	puts("S\n");
  	protected_mode_jump(boot_params.hdr.code32_start,
- 			    (u32)&boot_params + (ds() << 4));
- }