- mpparse printk should be in hex (john stultz <johnstul@us.ibm.com>)
- fiddle with RCU copyright messages (Dipankar Sarma <dipankar@in.ibm.com>)
arch/i386/kernel/mpparse.c | 2 +-
include/linux/rcupdate.h | 2 +-
kernel/rcupdate.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/i386/kernel/mpparse.c~misc38 arch/i386/kernel/mpparse.c
--- 25/arch/i386/kernel/mpparse.c~misc38 2003-09-26 22:22:04.000000000 -0700
+++ 25-akpm/arch/i386/kernel/mpparse.c 2003-09-27 00:01:29.000000000 -0700
@@ -169,7 +169,7 @@ void __init MP_processor_info (struct mp
if (num_processors >= NR_CPUS) {
printk(KERN_WARNING "NR_CPUS limit of %i reached. Cannot "
- "boot CPU(apicid 0x%d).\n", NR_CPUS, m->mpc_apicid);
+ "boot CPU(apicid 0x%x).\n", NR_CPUS, m->mpc_apicid);
return;
}
num_processors++;
diff -puN include/linux/rcupdate.h~misc38 include/linux/rcupdate.h
--- 25/include/linux/rcupdate.h~misc38 2003-09-27 00:01:52.000000000 -0700
+++ 25-akpm/include/linux/rcupdate.h 2003-09-27 00:01:59.000000000 -0700
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Copyright (c) IBM Corporation, 2001
+ * Copyright (C) IBM Corporation, 2001
*
* Author: Dipankar Sarma <dipankar@in.ibm.com>
*
diff -puN kernel/rcupdate.c~misc38 kernel/rcupdate.c
--- 25/kernel/rcupdate.c~misc38 2003-09-27 00:01:55.000000000 -0700
+++ 25-akpm/kernel/rcupdate.c 2003-09-27 00:01:59.000000000 -0700
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Copyright (c) IBM Corporation, 2001
+ * Copyright (C) IBM Corporation, 2001
*
* Author: Dipankar Sarma <dipankar@in.ibm.com>
*
_