[SENT at 2003-02-11]
[MERGED]

  Hello,

  the following patch (against 2.5.59-1um) changes /proc/cpuinfo so that more
fields are presented --- the fields are ordered more-or-less standartly
(bogomips at the end) and introduces vendor_id + model name dummy fields
(making various scripts happy) and host field showing if we are running as tt
or skas.  Also Christian Laursen's <xi@borderworlds.dk> patch is included in
this one, adding processor field and empty line after the record listing.

  It should work just fine. Please apply.

 arch/um/kernel/um_arch.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

  Kind regards,
				Petr Baudis

diff -ru linux/arch/um/kernel/um_arch.c linux+pasky/arch/um/kernel/um_arch.c
--- linux/arch/um/kernel/um_arch.c	Fri Feb  7 13:18:54 2003
+++ linux+pasky/arch/um/kernel/um_arch.c	Tue Feb 11 00:01:46 2003
@@ -61,10 +61,14 @@
 		return 0;
 #endif
 
-	seq_printf(m, "bogomips\t: %lu.%02lu\n",
+	seq_printf(m, "processor\t: %d\n", index);
+	seq_printf(m, "vendor_id\t: User Mode Linux\n");
+	seq_printf(m, "model name\t: UML\n");
+	seq_printf(m, "mode\t\t: %s\n", CHOOSE_MODE("tt", "skas"));
+	seq_printf(m, "host\t\t: %s\n", host_info);
+	seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
 		   loops_per_jiffy/(500000/HZ),
 		   (loops_per_jiffy/(5000/HZ)) % 100);
-	seq_printf(m, "host\t\t: %s\n", host_info);
 
 	return(0);
 }