[Linuxconsole-commit]CVS: ruby/linux/arch/ppc64/kernel ioctl32.c,1.5,1.6 setup.c,1.4,1.5

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv29363/linux/arch/ppc64/kernel

Modified Files:
	ioctl32.c setup.c 
Log Message:
Synced to 2.5.20.

Index: ioctl32.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/ioctl32.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ioctl32.c	16 May 2002 18:01:38 -0000	1.5
+++ ioctl32.c	4 Jun 2002 19:45:06 -0000	1.6
@@ -3764,6 +3764,7 @@
 COMPATIBLE_IOCTL(TCSETSF),
 COMPATIBLE_IOCTL(TIOCLINUX),
 COMPATIBLE_IOCTL(TIOCSTART),
+COMPATIBLE_IOCTL(TIOCSTOP),
 /* Little t */
 COMPATIBLE_IOCTL(TIOCGETD),
 COMPATIBLE_IOCTL(TIOCSETD),
@@ -4344,8 +4345,6 @@
 COMPATIBLE_IOCTL(HCIDEVUP),
 COMPATIBLE_IOCTL(HCIDEVDOWN),
 COMPATIBLE_IOCTL(HCIDEVRESET),
-COMPATIBLE_IOCTL(HCIRESETSTAT),
-COMPATIBLE_IOCTL(HCIGETINFO),
 COMPATIBLE_IOCTL(HCIGETDEVLIST),
 COMPATIBLE_IOCTL(HCISETRAW),
 COMPATIBLE_IOCTL(HCISETSCAN),

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c	16 May 2002 18:01:38 -0000	1.4
+++ setup.c	4 Jun 2002 19:45:08 -0000	1.5
@@ -129,6 +129,14 @@
 	/* This should be fixed properly in kernel/resource.c */
 	iomem_resource.end = MEM_SPACE_LIMIT;
 
+#ifdef CONFIG_XMON_DEFAULT
+	debugger = xmon;
+	debugger_bpt = xmon_bpt;
+	debugger_sstep = xmon_sstep;
+	debugger_iabr_match = xmon_iabr_match;
+	debugger_dabr_match = xmon_dabr_match;
+#endif
+
 	/* pSeries systems are identified in prom.c via OF. */
 	if ( itLpNaca.xLparInstalled == 1 )
 		naca->platform = PLATFORM_ISERIES_LPAR;
@@ -370,10 +378,15 @@
 #endif
 
 	cmd_line[0] = 0;
+
+#ifdef CONFIG_CMDLINE
+	strcpy(cmd_line, CONFIG_CMDLINE);
+#endif /* CONFIG_CMDLINE */
+
 	chosen = find_devices("chosen");
 	if (chosen != NULL) {
 		p = get_property(chosen, "bootargs", NULL);
-		if (p != NULL)
+		if (p != NULL && p[0] != 0)
 			strncpy(cmd_line, p, sizeof(cmd_line));
 	}
 	cmd_line[sizeof(cmd_line) - 1] = 0;
@@ -506,11 +519,6 @@
 
 	ppc_md.progress("setup_arch:enter", 0x3eab);
 
-#if defined(CONFIG_KGDB)
-	kgdb_map_scc();
-	set_debug_traps();
-	breakpoint();
-#endif
 	/*
 	 * Set cache line size based on type of cpu as a default.
 	 * Systems with OF can look in the properties on the cpu node(s)
@@ -540,26 +548,6 @@
 	paging_init();
 	sort_exception_table();
 	ppc_md.progress("setup_arch: exit", 0x3eab);
-}
-
-void exception_trace(unsigned long trap)
-{
-	unsigned long x, srr0, srr1, reg20, reg1, reg21;
-
-	asm("mflr %0" : "=r" (x) :);
-	asm("mfspr %0,0x1a" : "=r" (srr0) :);
-	asm("mfspr %0,0x1b" : "=r" (srr1) :);
-	asm("mr %0,1" : "=r" (reg1) :);
-	asm("mr %0,20" : "=r" (reg20) :);
-	asm("mr %0,21" : "=r" (reg21) :);
-
-	udbg_puts("\n");
-	udbg_puts("Took an exception : "); udbg_puthex(x); udbg_puts("\n");
-	udbg_puts("   "); udbg_puthex(reg1); udbg_puts("\n");
-	udbg_puts("   "); udbg_puthex(reg20); udbg_puts("\n");
-	udbg_puts("   "); udbg_puthex(reg21); udbg_puts("\n");
-	udbg_puts("   "); udbg_puthex(srr0); udbg_puts("\n");
-	udbg_puts("   "); udbg_puthex(srr1); udbg_puts("\n");
 }
 
 int set_spread_lpevents( char * str )