diff -urN linux-2.6.0-test1/arch/m68k/amiga/amiints.c linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/amiints.c
--- linux-2.6.0-test1/arch/m68k/amiga/amiints.c	2003-07-13 23:39:33.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/amiints.c	2003-07-23 17:11:56.000000000 -0400
@@ -126,7 +126,7 @@
 	irq_node_t *cur;
 
 	if (!node->dev_id)
-		printk("%s: Warning: dev_id of %s is zero\n",
+		printk(KERN_WARNING "%s: Warning: dev_id of %s is zero\n",
 		       __FUNCTION__, node->devname);
 
 	local_irq_save(flags);
@@ -174,7 +174,7 @@
 		}
 	}
 	local_irq_restore(flags);
-	printk ("%s: tried to remove invalid irq\n", __FUNCTION__);
+	printk (KERN_WARNING "%s: tried to remove invalid irq\n", __FUNCTION__);
 }
 
 /*
@@ -191,7 +191,7 @@
 	int error = 0;
 
 	if (irq >= AMI_IRQS) {
-		printk ("%s: Unknown IRQ %d from %s\n", __FUNCTION__,
+		printk (KERN_ERR "%s: Unknown IRQ %d from %s\n", __FUNCTION__,
 			irq, devname);
 		return -ENXIO;
 	}
@@ -239,7 +239,7 @@
 void amiga_free_irq(unsigned int irq, void *dev_id)
 {
 	if (irq >= AMI_IRQS) {
-		printk ("%s: Unknown IRQ %d\n", __FUNCTION__, irq);
+		printk (KERN_ERR "%s: Unknown IRQ %d\n", __FUNCTION__, irq);
 		return;
 	}
 
@@ -263,7 +263,7 @@
 			custom.intena = amiga_intena_vals[irq];
 	} else {
 		if (ami_irq_list[irq]->dev_id != dev_id)
-			printk("%s: removing probably wrong IRQ %d from %s\n",
+			printk(KERN_WARNING "%s: removing probably wrong IRQ %d from %s\n",
 			       __FUNCTION__, irq, ami_irq_list[irq]->devname);
 		ami_irq_list[irq]->handler = ami_badint;
 		ami_irq_list[irq]->flags   = 0;
@@ -284,7 +284,7 @@
 void amiga_enable_irq(unsigned int irq)
 {
 	if (irq >= AMI_IRQS) {
-		printk("%s: Unknown IRQ %d\n", __FUNCTION__, irq);
+		printk(KERN_ERR "%s: Unknown IRQ %d\n", __FUNCTION__, irq);
 		return;
 	}
 
@@ -293,7 +293,7 @@
 
 	/* No action for auto-vector interrupts */
 	if (irq >= IRQ_AMIGA_AUTO){
-		printk("%s: Trying to enable auto-vector IRQ %i\n",
+		printk(KERN_ERR "%s: Trying to enable auto-vector IRQ %i\n",
 		       __FUNCTION__, irq - IRQ_AMIGA_AUTO);
 		return;
 	}
@@ -319,7 +319,7 @@
 void amiga_disable_irq(unsigned int irq)
 {
 	if (irq >= AMI_IRQS) {
-		printk("%s: Unknown IRQ %d\n", __FUNCTION__, irq);
+		printk(KERN_ERR "%s: Unknown IRQ %d\n", __FUNCTION__, irq);
 		return;
 	}
 
@@ -328,7 +328,7 @@
 
 	/* No action for auto-vector interrupts */
 	if (irq >= IRQ_AMIGA_AUTO) {
-		printk("%s: Trying to disable auto-vector IRQ %i\n",
+		printk(KERN_ERR "%s: Trying to disable auto-vector IRQ %i\n",
 		       __FUNCTION__, irq - IRQ_AMIGA_AUTO);
 		return;
 	}
diff -urN linux-2.6.0-test1/arch/m68k/amiga/chipram.c linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/chipram.c
--- linux-2.6.0-test1/arch/m68k/amiga/chipram.c	2003-07-13 23:35:15.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/chipram.c	2003-07-23 17:09:46.000000000 -0400
@@ -49,7 +49,7 @@
     size = PAGE_ALIGN(size);
 
 #ifdef DEBUG
-    printk("amiga_chip_alloc: allocate %ld bytes\n", size);
+    printk(KERN_DEBUG "amiga_chip_alloc: allocate %ld bytes\n", size);
 #endif
     res = kmalloc(sizeof(struct resource), GFP_KERNEL);
     if (!res)
@@ -63,7 +63,7 @@
     }
     chipavail -= size;
 #ifdef DEBUG
-    printk("amiga_chip_alloc: returning %lx\n", res->start);
+    printk(KERN_DEBUG "amiga_chip_alloc: returning %lx\n", res->start);
 #endif
     return (void *)ZTWO_VADDR(res->start);
 }
@@ -86,16 +86,16 @@
     start = CHIP_PHYSADDR + chipavail - size;
 
 #ifdef DEBUG
-    printk("amiga_chip_alloc_res: allocate %ld bytes\n", size);
+    printk(KERN_DEBUG "amiga_chip_alloc_res: allocate %ld bytes\n", size);
 #endif
     if (allocate_resource(&chipram_res, res, size, start, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
-	printk("amiga_chip_alloc_res: first alloc failed!\n");
+	printk(KERN_INFO "amiga_chip_alloc_res: first alloc failed!\n");
 	if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0)
 	    return NULL;
     }
     chipavail -= size;
 #ifdef DEBUG
-    printk("amiga_chip_alloc_res: returning %lx\n", res->start);
+    printk(KERN_DEBUG "amiga_chip_alloc_res: returning %lx\n", res->start);
 #endif
     return (void *)ZTWO_VADDR(res->start);
 }
@@ -112,20 +112,20 @@
 	*p = res->sibling;
 	size = res->end-start;
 #ifdef DEBUG
-	printk("amiga_chip_free: free %ld bytes at %p\n", size, ptr);
+	printk(KERN_DEBUG "amiga_chip_free: free %ld bytes at %p\n", size, ptr);
 #endif
 	chipavail += size;
 	kfree(res);
 	return;
     }
-    printk("amiga_chip_free: trying to free nonexistent region at %p\n", ptr);
+    printk(KERN_INFO "amiga_chip_free: trying to free nonexistent region at %p\n", ptr);
 }
 
 
 unsigned long amiga_chip_avail(void)
 {
 #ifdef DEBUG
-	printk("amiga_chip_avail : %ld bytes\n", chipavail);
+	printk(KERN_DEBUG "amiga_chip_avail : %ld bytes\n", chipavail);
 #endif
 	return chipavail;
 }
diff -urN linux-2.6.0-test1/arch/m68k/amiga/cia.c linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/cia.c
--- linux-2.6.0-test1/arch/m68k/amiga/cia.c	2003-07-13 23:35:53.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/cia.c	2003-07-23 17:10:06.000000000 -0400
@@ -110,7 +110,7 @@
 void cia_free_irq(struct ciabase *base, unsigned int irq, void *dev_id)
 {
 	if (base->irq_list[irq].dev_id != dev_id)
-		printk("%s: removing probably wrong IRQ %i from %s\n",
+		printk(KERN_WARNING "%s: removing probably wrong IRQ %i from %s\n",
 		       __FUNCTION__, base->cia_irq + irq,
 		       base->irq_list[irq].devname);
 
diff -urN linux-2.6.0-test1/arch/m68k/amiga/config.c linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/config.c
--- linux-2.6.0-test1/arch/m68k/amiga/config.c	2003-07-13 23:29:27.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/amiga/config.c	2003-07-23 17:09:01.000000000 -0400
@@ -179,7 +179,7 @@
 		dev->resource.start = (unsigned long)cd->cd_BoardAddr;
 		dev->resource.end = dev->resource.start+cd->cd_BoardSize-1;
 	    } else
-		printk("amiga_parse_bootinfo: too many AutoConfig devices\n");
+		printk(KERN_ERR "amiga_parse_bootinfo: too many AutoConfig devices\n");
 #endif /* CONFIG_ZORRO */
 	    break;
 
@@ -205,9 +205,9 @@
 
   memset(&amiga_hw_present, 0, sizeof(amiga_hw_present));
 
-  printk("Amiga hardware found: ");
+  printk(KERN_INFO "Amiga hardware found: ");
   if (amiga_model >= AMI_500 && amiga_model <= AMI_DRACO) {
-    printk("[%s] ", amiga_models[amiga_model-AMI_500]);
+    printk(KERN_INFO "[%s] ", amiga_models[amiga_model-AMI_500]);
     strcat(amiga_model_name, amiga_models[amiga_model-AMI_500]);
   }
 
@@ -318,7 +318,7 @@
 
 #define AMIGAHW_ANNOUNCE(name, str)			\
   if (AMIGAHW_PRESENT(name))				\
-    printk(str)
+    printk(KERN_NOTICE str)
 
   AMIGAHW_ANNOUNCE(AMI_VIDEO, "VIDEO ");
   AMIGAHW_ANNOUNCE(AMI_BLITTER, "BLITTER ");
@@ -350,8 +350,8 @@
   AMIGAHW_ANNOUNCE(MAGIC_REKICK, "MAGIC_REKICK ");
   AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA ");
   if (AMIGAHW_PRESENT(ZORRO))
-    printk("ZORRO%s ", AMIGAHW_PRESENT(ZORRO3) ? "3" : "");
-  printk("\n");
+    printk(KERN_NOTICE "ZORRO%s ", AMIGAHW_PRESENT(ZORRO3) ? "3" : "");
+  printk(KERN_NOTICE "\n");
 
 #undef AMIGAHW_ANNOUNCE
 }
@@ -438,7 +438,7 @@
       if (m68k_memory[i].addr < 16*1024*1024) {
 	if (i == 0) {
 	  /* don't cut off the branch we're sitting on */
-	  printk("Warning: kernel runs in Zorro II memory\n");
+	  printk(KERN_WARNING "Warning: kernel runs in Zorro II memory\n");
 	  continue;
 	}
 	disabled_z2mem += m68k_memory[i].size;
@@ -448,7 +448,7 @@
 	i--;
       }
     if (disabled_z2mem)
-      printk("%dK of Zorro II memory will not be used as system memory\n",
+      printk(KERN_NOTICE "%dK of Zorro II memory will not be used as system memory\n",
 	     disabled_z2mem>>10);
   }
 
@@ -469,7 +469,7 @@
   /* debugging using chipram */
   if (!strcmp( m68k_debug_device, "mem" )){
 	  if (!AMIGAHW_PRESENT(CHIP_RAM))
-		  printk("Warning: no chipram present for debugging\n");
+		  printk(KERN_WARNING "Warning: no chipram present for debugging\n");
 	  else {
 		  amiga_savekmsg_init();
 		  amiga_console_driver.write = amiga_mem_console_write;
@@ -500,7 +500,7 @@
 	jiffy_ticks = (amiga_eclock+HZ/2)/HZ;
 
 	if (request_resource(&mb_resources._ciab, &sched_res))
-	    printk("Cannot allocate ciab.ta{lo,hi}\n");
+	    printk(KERN_ERR "Cannot allocate ciab.ta{lo,hi}\n");
 	ciab.cra &= 0xC0;   /* turn off timer A, continuous mode, from Eclk */
 	ciab.talo = jiffy_ticks % 256;
 	ciab.tahi = jiffy_ticks / 256;
diff -urN linux-2.6.0-test1/arch/m68k/apollo/config.c linux-2.6.0-test1-printk-m68k/arch/m68k/apollo/config.c
--- linux-2.6.0-test1/arch/m68k/apollo/config.c	2003-07-13 23:37:31.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/apollo/config.c	2003-07-23 17:06:29.000000000 -0400
@@ -75,8 +75,8 @@
 void dn_setup_model(void) {
 	
 
-	printk("Apollo hardware found: ");
-	printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]);
+	printk(KERN_INFO "Apollo hardware found: ");
+	printk(KERN_INFO "[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]);
 
 	switch(apollo_model) {
 		case APOLLO_UNKNOWN:
@@ -219,8 +219,8 @@
 	*(volatile unsigned char *)(pica+1)&=(~8);
 
 #if 0
-	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));
-	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));
+	printk(KERN_DEBUG "*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));
+	printk(KERN_DEBUG "*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));
 #endif
 
 	sched_timer_handler=timer_routine;
@@ -262,7 +262,7 @@
 
 int dn_dummy_set_clock_mmss(unsigned long nowtime) {
 
-  printk("set_clock_mmss\n");
+  printk(KERN_NOTICE "set_clock_mmss\n");
 
   return 0;
 
diff -urN linux-2.6.0-test1/arch/m68k/apollo/dma.c linux-2.6.0-test1-printk-m68k/arch/m68k/apollo/dma.c
--- linux-2.6.0-test1/arch/m68k/apollo/dma.c	2003-07-13 23:37:18.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/apollo/dma.c	2003-07-23 17:05:28.000000000 -0400
@@ -26,7 +26,7 @@
 	free_xlat_entry=next_free_xlat_entry;
 	for(i=0,xlat_map_entry=addr_xlat_map+(free_xlat_entry<<2);i<8;i++,xlat_map_entry++) {
 #if 0
-		printk("phys_addr: %x, page_aligned_addr: %x, start_map_addr: %x\n",phys_addr,page_aligned_addr,start_map_addr+i);
+		printk(KERN_WARNING "phys_addr: %x, page_aligned_addr: %x, start_map_addr: %x\n",phys_addr,page_aligned_addr,start_map_addr+i);
 #endif
 		out_be16(xlat_map_entry, start_map_addr+i);
 	}
@@ -36,7 +36,7 @@
 		next_free_xlat_entry=0;
 	
 #if 0
-	printk("next_free_xlat_entry: %d\n",next_free_xlat_entry);
+	printk(KERN_WARNING "next_free_xlat_entry: %d\n",next_free_xlat_entry);
 #endif
 
 	return free_xlat_entry<<10;
diff -urN linux-2.6.0-test1/arch/m68k/apollo/dn_ints.c linux-2.6.0-test1-printk-m68k/arch/m68k/apollo/dn_ints.c
--- linux-2.6.0-test1/arch/m68k/apollo/dn_ints.c	2003-07-13 23:35:53.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/apollo/dn_ints.c	2003-07-23 17:05:00.000000000 -0400
@@ -21,7 +21,7 @@
   if(dn_irqs[irq-160].handler) {
     res = dn_irqs[irq-160].handler(irq,dn_irqs[irq-160].dev_id,fp);
   } else {
-    printk("spurious irq %d occurred\n",irq);
+    printk(KERN_NOTICE "spurious irq %d occurred\n",irq);
   }
 
   *(volatile unsigned char *)(pica)=0x20;
@@ -46,7 +46,7 @@
 int dn_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id) {
 
   if((irq<0) || (irq>15)) {
-    printk("Trying to request illegal IRQ\n");
+    printk(KERN_ERR "Trying to request illegal IRQ\n");
     return -ENXIO;
   }
 
@@ -63,7 +63,7 @@
     return 0;
   }
   else {
-    printk("Trying to request already assigned irq %d\n",irq);
+    printk(KERN_ERR "Trying to request already assigned irq %d\n",irq);
     return -ENXIO;
   }
 
@@ -72,7 +72,7 @@
 void dn_free_irq(unsigned int irq, void *dev_id) {
 
   if((irq<0) || (irq>15)) {
-    printk("Trying to free illegal IRQ\n");
+    printk(KERN_ERR "Trying to free illegal IRQ\n");
     return ;
   }
 
@@ -92,19 +92,19 @@
 
 void dn_enable_irq(unsigned int irq) {
 
-  printk("dn enable irq\n");
+  printk(KERN_NOTICE "dn enable irq\n");
 
 }
 
 void dn_disable_irq(unsigned int irq) {
 
-  printk("dn disable irq\n");
+  printk(KERN_NOTICE "dn disable irq\n");
 
 }
 
 int show_dn_interrupts(struct seq_file *p, void *v) {
 
-  printk("dn get irq list\n");
+  printk(KERN_NOTICE "dn get irq list\n");
 
   return 0;
 
@@ -112,7 +112,7 @@
 
 struct fb_info *dn_dummy_fb_init(long *mem_start) {
 
-  printk("fb init\n");
+  printk(KERN_NOTICE "fb init\n");
 
   return NULL;
 
@@ -120,6 +120,6 @@
 
 void dn_dummy_video_setup(char *options,int *ints) {
 
-  printk("no video yet\n");
+  printk(KERN_NOTICE "no video yet\n");
 
 }
diff -urN linux-2.6.0-test1/arch/m68k/atari/ataints.c linux-2.6.0-test1-printk-m68k/arch/m68k/atari/ataints.c
--- linux-2.6.0-test1/arch/m68k/atari/ataints.c	2003-07-13 23:31:21.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/atari/ataints.c	2003-07-23 17:13:53.000000000 -0400
@@ -434,17 +434,17 @@
 	flags &= ~SA_SHIRQ;
 
 	if (flags == SA_INTERRUPT) {
-		printk ("%s: SA_INTERRUPT changed to IRQ_TYPE_SLOW for %s\n",
+		printk (KERN_NOTICE "%s: SA_INTERRUPT changed to IRQ_TYPE_SLOW for %s\n",
 			__FUNCTION__, devname);
 		flags = IRQ_TYPE_SLOW;
 	}
 	if (flags < IRQ_TYPE_SLOW || flags > IRQ_TYPE_PRIO) {
-		printk ("%s: Bad irq type 0x%lx <0x%lx> requested from %s\n",
+		printk (KERN_ERR "%s: Bad irq type 0x%lx <0x%lx> requested from %s\n",
 		        __FUNCTION__, flags, oflags, devname);
 		return -EINVAL;
 	}
 	if (!IS_VALID_INTNO(irq)) {
-		printk ("%s: Unknown irq %d requested from %s\n",
+		printk (KERN_ERR "%s: Unknown irq %d requested from %s\n",
 		        __FUNCTION__, irq, devname);
 		return -ENXIO;
 	}
@@ -456,7 +456,7 @@
 	 */
 	if (flags == IRQ_TYPE_SLOW &&
 		(irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE)) {
-		printk ("%s: Slow irq requested for non-MFP source %d from %s\n",
+		printk (KERN_ERR "%s: Slow irq requested for non-MFP source %d from %s\n",
 		        __FUNCTION__, irq, devname);
 		return -EINVAL;
 	}
@@ -510,7 +510,7 @@
 		local_irq_restore(flags);
 		return 0;
 	} else {
-		printk ("%s: Irq %d allocated by other type int (call from %s)\n",
+		printk (KERN_ERR "%s: Irq %d allocated by other type int (call from %s)\n",
 		        __FUNCTION__, irq, devname);
 		return -EBUSY;
 	}
@@ -523,7 +523,7 @@
 	irq_node_t **list, *node;
 
 	if (!IS_VALID_INTNO(irq)) {
-		printk("%s: Unknown irq %d\n", __FUNCTION__, irq);
+		printk(KERN_ERR "%s: Unknown irq %d\n", __FUNCTION__, irq);
 		return;
 	}
 
@@ -577,7 +577,7 @@
 	return;
 
 not_found:
-	printk("%s: tried to remove invalid irq\n", __FUNCTION__);
+	printk(KERN_ERR "%s: tried to remove invalid irq\n", __FUNCTION__);
 	return;
 }
 
diff -urN linux-2.6.0-test1/arch/m68k/atari/config.c linux-2.6.0-test1-printk-m68k/arch/m68k/atari/config.c
--- linux-2.6.0-test1/arch/m68k/atari/config.c	2003-07-13 23:35:51.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/atari/config.c	2003-07-23 17:16:41.000000000 -0400
@@ -274,52 +274,52 @@
      * Determine hardware present
      */
 
-    printk( "Atari hardware found: " );
+    printk(KERN_INFO  "Atari hardware found: " );
     if (MACH_IS_MEDUSA || MACH_IS_HADES) {
         /* There's no Atari video hardware on the Medusa, but all the
          * addresses below generate a DTACK so no bus error occurs! */
     }
     else if (hwreg_present( f030_xreg )) {
 	ATARIHW_SET(VIDEL_SHIFTER);
-        printk( "VIDEL " );
+        printk(KERN_INFO  "VIDEL " );
         /* This is a temporary hack: If there is Falcon video
          * hardware, we assume that the ST-DMA serves SCSI instead of
          * ACSI. In the future, there should be a better method for
          * this...
          */
 	ATARIHW_SET(ST_SCSI);
-        printk( "STDMA-SCSI " );
+        printk(KERN_INFO  "STDMA-SCSI " );
     }
     else if (hwreg_present( tt_palette )) {
 	ATARIHW_SET(TT_SHIFTER);
-        printk( "TT_SHIFTER " );
+        printk(KERN_INFO "TT_SHIFTER " );
     }
     else if (hwreg_present( &shifter.bas_hi )) {
         if (hwreg_present( &shifter.bas_lo ) &&
 	    (shifter.bas_lo = 0x0aau, shifter.bas_lo == 0x0aau)) {
 	    ATARIHW_SET(EXTD_SHIFTER);
-            printk( "EXTD_SHIFTER " );
+            printk(KERN_INFO "EXTD_SHIFTER " );
         }
         else {
 	    ATARIHW_SET(STND_SHIFTER);
-            printk( "STND_SHIFTER " );
+            printk(KERN_INFO "STND_SHIFTER " );
         }
     }
     if (hwreg_present( &mfp.par_dt_reg )) {
 	ATARIHW_SET(ST_MFP);
-        printk( "ST_MFP " );
+        printk(KERN_INFO "ST_MFP " );
     }
     if (hwreg_present( &tt_mfp.par_dt_reg )) {
 	ATARIHW_SET(TT_MFP);
-        printk( "TT_MFP " );
+        printk(KERN_INFO "TT_MFP " );
     }
     if (hwreg_present( &tt_scsi_dma.dma_addr_hi )) {
 	ATARIHW_SET(SCSI_DMA);
-        printk( "TT_SCSI_DMA " );
+        printk(KERN_INFO "TT_SCSI_DMA " );
     }
     if (!MACH_IS_HADES && hwreg_present( &st_dma.dma_hi )) {
 	ATARIHW_SET(STND_DMA);
-        printk( "STND_DMA " );
+        printk(KERN_INFO "STND_DMA " );
     }
     if (MACH_IS_MEDUSA || /* The ST-DMA address registers aren't readable
 			   * on all Medusas, so the test below may fail */
@@ -329,28 +329,28 @@
          (st_dma.dma_vhi = 0xaa) && (st_dma.dma_hi = 0x55) &&
          st_dma.dma_vhi == 0xaa && st_dma.dma_hi == 0x55)) {
 	ATARIHW_SET(EXTD_DMA);
-        printk( "EXTD_DMA " );
+        printk(KERN_INFO "EXTD_DMA " );
     }
     if (hwreg_present( &tt_scsi.scsi_data )) {
 	ATARIHW_SET(TT_SCSI);
-        printk( "TT_SCSI " );
+        printk(KERN_INFO "TT_SCSI " );
     }
     if (hwreg_present( &sound_ym.rd_data_reg_sel )) {
 	ATARIHW_SET(YM_2149);
-        printk( "YM2149 " );
+        printk(KERN_INFO "YM2149 " );
     }
     if (!MACH_IS_MEDUSA && !MACH_IS_HADES &&
 	hwreg_present( &tt_dmasnd.ctrl )) {
 	ATARIHW_SET(PCM_8BIT);
-        printk( "PCM " );
+        printk(KERN_INFO "PCM " );
     }
     if (!MACH_IS_HADES && hwreg_present( &codec.unused5 )) {
 	ATARIHW_SET(CODEC);
-        printk( "CODEC " );
+        printk(KERN_INFO "CODEC " );
     }
     if (hwreg_present( &dsp56k_host_interface.icr )) {
 	ATARIHW_SET(DSP56K);
-        printk( "DSP56K " );
+        printk(KERN_INFO "DSP56K " );
     }
     if (hwreg_present( &tt_scc_dma.dma_ctrl ) &&
 #if 0
@@ -362,38 +362,38 @@
 #endif
 	) {
 	ATARIHW_SET(SCC_DMA);
-        printk( "SCC_DMA " );
+        printk(KERN_INFO "SCC_DMA " );
     }
     if (scc_test( &scc.cha_a_ctrl )) {
 	ATARIHW_SET(SCC);
-        printk( "SCC " );
+        printk(KERN_INFO "SCC " );
     }
     if (scc_test( &st_escc.cha_b_ctrl )) {
 	ATARIHW_SET( ST_ESCC );
-	printk( "ST_ESCC " );
+	printk(KERN_INFO "ST_ESCC " );
     }
     if (MACH_IS_HADES)
     {
         ATARIHW_SET( VME );
-        printk( "VME " );
+        printk(KERN_INFO "VME " );
     }
     else if (hwreg_present( &tt_scu.sys_mask )) {
 	ATARIHW_SET(SCU);
 	/* Assume a VME bus if there's a SCU */
 	ATARIHW_SET( VME );
-        printk( "VME SCU " );
+        printk(KERN_INFO "VME SCU " );
     }
     if (hwreg_present( (void *)(0xffff9210) )) {
 	ATARIHW_SET(ANALOG_JOY);
-        printk( "ANALOG_JOY " );
+        printk(KERN_INFO "ANALOG_JOY " );
     }
     if (!MACH_IS_HADES && hwreg_present( blitter.halftone )) {
 	ATARIHW_SET(BLITTER);
-        printk( "BLITTER " );
+        printk(KERN_INFO "BLITTER " );
     }
     if (hwreg_present((void *)0xfff00039)) {
 	ATARIHW_SET(IDE);
-        printk( "IDE " );
+        printk(KERN_INFO "IDE " );
     }
 #if 1 /* This maybe wrong */
     if (!MACH_IS_MEDUSA && !MACH_IS_HADES &&
@@ -406,18 +406,18 @@
 	 tt_microwire.data != 0)) {
 	ATARIHW_SET(MICROWIRE);
 	while (tt_microwire.mask != 0x7ff) ;
-        printk( "MICROWIRE " );
+        printk(KERN_INFO "MICROWIRE " );
     }
 #endif
     if (hwreg_present( &tt_rtc.regsel )) {
 	ATARIHW_SET(TT_CLK);
-        printk( "TT_CLK " );
+        printk(KERN_INFO "TT_CLK " );
         mach_hwclk = atari_tt_hwclk;
         mach_set_clock_mmss = atari_tt_set_clock_mmss;
     }
     if (!MACH_IS_HADES && hwreg_present( &mste_rtc.sec_ones)) {
 	ATARIHW_SET(MSTE_CLK);
-        printk( "MSTE_CLK ");
+        printk(KERN_INFO "MSTE_CLK ");
         mach_hwclk = atari_mste_hwclk;
         mach_set_clock_mmss = atari_mste_set_clock_mmss;
     }
@@ -425,13 +425,13 @@
 	hwreg_present( &dma_wd.fdc_speed ) &&
 	hwreg_write( &dma_wd.fdc_speed, 0 )) {
 	    ATARIHW_SET(FDCSPEED);
-	    printk( "FDC_SPEED ");
+	    printk(KERN_INFO "FDC_SPEED ");
     }
     if (!MACH_IS_HADES && !ATARIHW_PRESENT(ST_SCSI)) {
 	ATARIHW_SET(ACSI);
-        printk( "ACSI " );
+        printk(KERN_INFO "ACSI " );
     }
-    printk("\n");
+    printk(KERN_INFO "\n");
 
     if (CPU_IS_040_OR_060)
         /* Now it seems to be safe to turn of the tt0 transparent
diff -urN linux-2.6.0-test1/arch/m68k/bvme6000/bvmeints.c linux-2.6.0-test1-printk-m68k/arch/m68k/bvme6000/bvmeints.c
--- linux-2.6.0-test1/arch/m68k/bvme6000/bvmeints.c	2003-07-13 23:30:47.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/bvme6000/bvmeints.c	2003-07-23 17:17:28.000000000 -0400
@@ -64,7 +64,7 @@
                 unsigned long flags, const char *devname, void *dev_id)
 {
 	if (irq > 255) {
-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
+		printk(KERN_ERR "%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
 		return -ENXIO;
 	}
 #if 0
@@ -78,12 +78,12 @@
 #endif
 	if (!(irq_tab[irq].flags & IRQ_FLG_STD)) {
 		if (irq_tab[irq].flags & IRQ_FLG_LOCK) {
-			printk("%s: IRQ %d from %s is not replaceable\n",
+			printk(KERN_ERR "%s: IRQ %d from %s is not replaceable\n",
 			       __FUNCTION__, irq, irq_tab[irq].devname);
 			return -EBUSY;
 		}
 		if (flags & IRQ_FLG_REPLACE) {
-			printk("%s: %s can't replace IRQ %d from %s\n",
+			printk(KERN_ERR "%s: %s can't replace IRQ %d from %s\n",
 			       __FUNCTION__, devname, irq, irq_tab[irq].devname);
 			return -EBUSY;
 		}
@@ -98,7 +98,7 @@
 void bvme6000_free_irq(unsigned int irq, void *dev_id)
 {
 	if (irq > 255) {
-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+		printk(KERN_ERR "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
 		return;
 	}
 #if 0
@@ -108,7 +108,7 @@
 	}
 #endif
 	if (irq_tab[irq].dev_id != dev_id)
-		printk("%s: Removing probably wrong IRQ %d from %s\n",
+		printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
 		       __FUNCTION__, irq, irq_tab[irq].devname);
 
 	irq_tab[irq].handler = bvme6000_defhand;
@@ -120,7 +120,7 @@
 irqreturn_t bvme6000_process_int (unsigned long vec, struct pt_regs *fp)
 {
 	if (vec > 255) {
-		printk ("bvme6000_process_int: Illegal vector %ld", vec);
+		printk (KERN_ERR "bvme6000_process_int: Illegal vector %ld", vec);
 		return IRQ_NONE;
 	} else {
 		irq_tab[vec].count++;
@@ -145,7 +145,7 @@
 
 static irqreturn_t bvme6000_defhand (int irq, void *dev_id, struct pt_regs *fp)
 {
-	printk ("Unknown interrupt 0x%02x\n", irq);
+	printk (KERN_ERR "Unknown interrupt 0x%02x\n", irq);
 	return IRQ_NONE;
 }
 
diff -urN linux-2.6.0-test1/arch/m68k/kernel/bios32.c linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/bios32.c
--- linux-2.6.0-test1/arch/m68k/kernel/bios32.c	2003-07-13 23:34:40.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/bios32.c	2003-07-23 16:44:27.000000000 -0400
@@ -207,7 +207,7 @@
 				break;
 
 			case PCI_BASE_ADDRESS_MEM_TYPE_1M:
-				printk("bios32 WARNING: slot %d, function %d "
+				printk(KERN_WARNING "bios32 WARNING: slot %d, function %d "
 				       "requests memory below 1MB---don't "
 				       "know how to do that.\n",
 				       PCI_SLOT(dev->devfn),
@@ -481,7 +481,7 @@
 
 void __init pcibios_init(void)
 {
-	printk("Linux/m68k PCI BIOS32 revision %x.%02x\n", MAJOR_REV, MINOR_REV);
+	printk(KERN_INFO "Linux/m68k PCI BIOS32 revision %x.%02x\n", MAJOR_REV, MINOR_REV);
 
 	bus_info = NULL;
 #ifdef CONFIG_HADES
@@ -490,13 +490,13 @@
 #endif
 	if (bus_info != NULL)
 	{
-		printk("PCI: Probing PCI hardware\n");
+		printk(KERN_INFO "PCI: Probing PCI hardware\n");
 		pci_scan_bus(0, bus_info->m68k_pci_ops, bus_info);
 		pcibios_fixup();
 		pcibios_claim_resources(pci_root);
 	}
 	else
-		printk("PCI: No PCI bus detected\n");
+		printk(KERN_INFO "PCI: No PCI bus detected\n");
 }
 
 char * __init pcibios_setup(char *str)
diff -urN linux-2.6.0-test1/arch/m68k/kernel/ints.c linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/ints.c
--- linux-2.6.0-test1/arch/m68k/kernel/ints.c	2003-07-13 23:34:02.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/ints.c	2003-07-23 16:43:15.000000000 -0400
@@ -111,7 +111,7 @@
 		if (!node->handler)
 			return node;
 
-	printk ("new_irq_node: out of nodes\n");
+	printk (KERN_WARNING "new_irq_node: out of nodes\n");
 	return NULL;
 }
 
@@ -137,7 +137,7 @@
                     unsigned long flags, const char *devname, void *dev_id)
 {
 	if (irq < IRQ1 || irq > IRQ7) {
-		printk("%s: Incorrect IRQ %d from %s\n",
+		printk(KERN_ERR "%s: Incorrect IRQ %d from %s\n",
 		       __FUNCTION__, irq, devname);
 		return -ENXIO;
 	}
@@ -145,12 +145,12 @@
 #if 0
 	if (!(irq_list[irq].flags & IRQ_FLG_STD)) {
 		if (irq_list[irq].flags & IRQ_FLG_LOCK) {
-			printk("%s: IRQ %d from %s is not replaceable\n",
+			printk(KERN_ERR "%s: IRQ %d from %s is not replaceable\n",
 			       __FUNCTION__, irq, irq_list[irq].devname);
 			return -EBUSY;
 		}
 		if (!(flags & IRQ_FLG_REPLACE)) {
-			printk("%s: %s can't replace IRQ %d from %s\n",
+			printk(KERN_ERR "%s: %s can't replace IRQ %d from %s\n",
 			       __FUNCTION__, devname, irq, irq_list[irq].devname);
 			return -EBUSY;
 		}
@@ -167,12 +167,12 @@
 void sys_free_irq(unsigned int irq, void *dev_id)
 {
 	if (irq < IRQ1 || irq > IRQ7) {
-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+		printk(KERN_ERR "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
 		return;
 	}
 
 	if (irq_list[irq].dev_id != dev_id)
-		printk("%s: Removing probably wrong IRQ %d from %s\n",
+		printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
 		       __FUNCTION__, irq, irq_list[irq].devname);
 
 	irq_list[irq].handler = (*mach_default_handler)[irq];
@@ -206,25 +206,25 @@
 
 static void dummy_enable_irq(unsigned int irq)
 {
-	printk("calling uninitialized enable_irq()\n");
+	printk(KERN_WARNING "calling uninitialized enable_irq()\n");
 }
 
 static void dummy_disable_irq(unsigned int irq)
 {
-	printk("calling uninitialized disable_irq()\n");
+	printk(KERN_WARNING "calling uninitialized disable_irq()\n");
 }
 
 static int dummy_request_irq(unsigned int irq,
 		irqreturn_t (*handler) (int, void *, struct pt_regs *),
 		unsigned long flags, const char *devname, void *dev_id)
 {
-	printk("calling uninitialized request_irq()\n");
+	printk(KERN_WARNING "calling uninitialized request_irq()\n");
 	return 0;
 }
 
 static void dummy_free_irq(unsigned int irq, void *dev_id)
 {
-	printk("calling uninitialized disable_irq()\n");
+	printk(KERN_WARNING "calling uninitialized disable_irq()\n");
 }
 
 asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
diff -urN linux-2.6.0-test1/arch/m68k/kernel/process.c linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/process.c
--- linux-2.6.0-test1/arch/m68k/kernel/process.c	2003-07-13 23:39:32.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/process.c	2003-07-23 16:51:49.000000000 -0400
@@ -127,17 +127,17 @@
 
 void show_regs(struct pt_regs * regs)
 {
-	printk("\n");
-	printk("Format %02x  Vector: %04x  PC: %08lx  Status: %04x    %s\n",
+	printk(KERN_EMERG "\n");
+	printk(KERN_EMERG "Format %02x  Vector: %04x  PC: %08lx  Status: %04x    %s\n",
 	       regs->format, regs->vector, regs->pc, regs->sr, print_tainted());
-	printk("ORIG_D0: %08lx  D0: %08lx  A2: %08lx  A1: %08lx\n",
+	printk(KERN_EMERG "ORIG_D0: %08lx  D0: %08lx  A2: %08lx  A1: %08lx\n",
 	       regs->orig_d0, regs->d0, regs->a2, regs->a1);
-	printk("A0: %08lx  D5: %08lx  D4: %08lx\n",
+	printk(KERN_EMERG "A0: %08lx  D5: %08lx  D4: %08lx\n",
 	       regs->a0, regs->d5, regs->d4);
-	printk("D3: %08lx  D2: %08lx  D1: %08lx\n",
+	printk(KERN_EMERG "D3: %08lx  D2: %08lx  D1: %08lx\n",
 	       regs->d3, regs->d2, regs->d1);
 	if (!(regs->sr & PS_S))
-		printk("USP: %08lx\n", rdusp());
+		printk(KERN_EMERG "USP: %08lx\n", rdusp());
 }
 
 /*
diff -urN linux-2.6.0-test1/arch/m68k/kernel/setup.c linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/setup.c
--- linux-2.6.0-test1/arch/m68k/kernel/setup.c	2003-07-13 23:38:37.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/setup.c	2003-07-23 16:46:02.000000000 -0400
@@ -150,7 +150,7 @@
 		    m68k_memory[m68k_num_memory].size = data[1];
 		    m68k_num_memory++;
 		} else
-		    printk("m68k_parse_bootinfo: too many memory chunks\n");
+		    printk(KERN_WARNING "m68k_parse_bootinfo: too many memory chunks\n");
 		break;
 
 	    case BI_RAMDISK:
@@ -181,7 +181,7 @@
 		    unknown = 1;
 	}
 	if (unknown)
-	    printk("m68k_parse_bootinfo: unknown tag 0x%04x ignored\n",
+	    printk(KERN_WARNING "m68k_parse_bootinfo: unknown tag 0x%04x ignored\n",
 		   record->tag);
 	record = (struct bi_record *)((unsigned long)record+record->size);
     }
@@ -189,7 +189,7 @@
     m68k_realnum_memory = m68k_num_memory;
 #ifdef CONFIG_SINGLE_MEMORY_CHUNK
     if (m68k_num_memory > 1) {
-	printk("Ignoring last %i chunks of physical memory\n",
+	printk(KERN_INFO "Ignoring last %i chunks of physical memory\n",
 	       (m68k_num_memory - 1));
 	m68k_num_memory = 1;
     }
@@ -365,7 +365,7 @@
 		reserve_bootmem(m68k_ramdisk.addr, m68k_ramdisk.size);
 		initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr);
 		initrd_end = initrd_start + m68k_ramdisk.size;
-		printk ("initrd: %08lx - %08lx\n", initrd_start, initrd_end);
+		printk (KERN_INFO "initrd: %08lx - %08lx\n", initrd_start, initrd_end);
 	}
 #endif
 
diff -urN linux-2.6.0-test1/arch/m68k/kernel/signal.c linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/signal.c
--- linux-2.6.0-test1/arch/m68k/kernel/signal.c	2003-07-13 23:36:35.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/signal.c	2003-07-23 16:45:01.000000000 -0400
@@ -350,7 +350,7 @@
 		 * user process trying to return with weird frame format
 		 */
 #if DEBUG
-		printk("user process returning with weird frame format\n");
+		printk(KERN_DEBUG "user process returning with weird frame format\n");
 #endif
 		goto badframe;
 	}
@@ -451,7 +451,7 @@
 		 * user process trying to return with weird frame format
 		 */
 #if DEBUG
-		printk("user process returning with weird frame format\n");
+		printk(KERN_DEBUG "user process returning with weird frame format\n");
 #endif
 		goto badframe;
 	}
@@ -779,7 +779,7 @@
 
 	if (fsize < 0) {
 #ifdef DEBUG
-		printk ("setup_frame: Unknown frame format %#x\n",
+		printk (KERN_DEBUG "setup_frame: Unknown frame format %#x\n",
 			regs->format);
 #endif
 		goto give_sigsegv;
@@ -830,7 +830,7 @@
 		struct pt_regs *tregs =
 			(struct pt_regs *)((ulong)regs + regs->stkadj);
 #if DEBUG
-		printk("Performing stackadjust=%04x\n", regs->stkadj);
+		printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj);
 #endif
 		/* This must be copied with decreasing addresses to
                    handle overlaps.  */
@@ -857,7 +857,7 @@
 
 	if (fsize < 0) {
 #ifdef DEBUG
-		printk ("setup_frame: Unknown frame format %#x\n",
+		printk (KERN_DEBUG "setup_frame: Unknown frame format %#x\n",
 			regs->format);
 #endif
 		goto give_sigsegv;
@@ -913,7 +913,7 @@
 		struct pt_regs *tregs =
 			(struct pt_regs *)((ulong)regs + regs->stkadj);
 #if DEBUG
-		printk("Performing stackadjust=%04x\n", regs->stkadj);
+		printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj);
 #endif
 		/* This must be copied with decreasing addresses to
                    handle overlaps.  */
diff -urN linux-2.6.0-test1/arch/m68k/kernel/traps.c linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/traps.c
--- linux-2.6.0-test1/arch/m68k/kernel/traps.c	2003-07-13 23:39:32.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/kernel/traps.c	2003-07-23 16:51:30.000000000 -0400
@@ -206,7 +206,7 @@
 	unsigned long fslw = fp->un.fmt4.pc; /* is really FSLW for access error */
 
 #ifdef DEBUG
-	printk("fslw=%#lx, fa=%#lx\n", fslw, fp->un.fmt4.effaddr);
+	printk(KERN_DEBUG "fslw=%#lx, fa=%#lx\n", fslw, fp->un.fmt4.effaddr);
 #endif
 
 	if (fslw & MMU060_BPE) {
@@ -235,7 +235,7 @@
 		if (fslw & MMU060_W)
 			errorcode |= 2;
 #ifdef DEBUG
-		printk("errorcode = %d\n", errorcode );
+		printk(KERN_DEBUG "errorcode = %d\n", errorcode );
 #endif
 		do_page_fault(&fp->ptregs, addr, errorcode);
 	} else if (fslw & (MMU060_SEE)){
@@ -244,8 +244,8 @@
 		 */
 		send_fault_sig(&fp->ptregs);
 	} else {
-		printk("pc=%#lx, fa=%#lx\n", fp->ptregs.pc, fp->un.fmt4.effaddr);
-		printk( "68060 access error, fslw=%lx\n", fslw );
+		printk(KERN_ALERT "pc=%#lx, fa=%#lx\n", fp->ptregs.pc, fp->un.fmt4.effaddr);
+		printk(KERN_ALERT "68060 access error, fslw=%lx\n", fslw );
 		trap_c( fp );
 	}
 }
@@ -297,7 +297,7 @@
 	
 
 #ifdef DEBUG
-	printk("do_040writeback1, res=%d\n",res);
+	printk(KERN_DEBUG "do_040writeback1, res=%d\n",res);
 #endif
 
 	return res;
@@ -320,7 +320,7 @@
 	int res = 0;
 #if 0
 	if (fp->un.fmt7.wb1s & WBV_040)
-		printk("access_error040: cannot handle 1st writeback. oops.\n");
+		printk(KERN_DEBUG "access_error040: cannot handle 1st writeback. oops.\n");
 #endif
 
 	if ((fp->un.fmt7.wb2s & WBV_040) &&
@@ -374,10 +374,10 @@
 	unsigned long mmusr;
 
 #ifdef DEBUG
-	printk("ssw=%#x, fa=%#lx\n", ssw, fp->un.fmt7.faddr);
-        printk("wb1s=%#x, wb2s=%#x, wb3s=%#x\n", fp->un.fmt7.wb1s,  
+	printk(KERN_DEBUG "ssw=%#x, fa=%#lx\n", ssw, fp->un.fmt7.faddr);
+        printk(KERN_DEBUG "wb1s=%#x, wb2s=%#x, wb3s=%#x\n", fp->un.fmt7.wb1s,  
 		fp->un.fmt7.wb2s, fp->un.fmt7.wb3s);
-	printk ("wb2a=%lx, wb3a=%lx, wb2d=%lx, wb3d=%lx\n", 
+	printk (KERN_DEBUG "wb2a=%lx, wb3a=%lx, wb2d=%lx, wb3d=%lx\n", 
 		fp->un.fmt7.wb2a, fp->un.fmt7.wb3a,
 		fp->un.fmt7.wb2d, fp->un.fmt7.wb3d);
 #endif
@@ -396,7 +396,7 @@
 		/* MMU error, get the MMUSR info for this access */
 		mmusr = probe040(!(ssw & RW_040), addr, ssw);
 #ifdef DEBUG
-		printk("mmusr = %lx\n", mmusr);
+		printk(KERN_DEBUG "mmusr = %lx\n", mmusr);
 #endif
 		errorcode = 1;
 		if (!(mmusr & MMU_R_040)) {
@@ -412,12 +412,12 @@
 
 		if (do_page_fault(&fp->ptregs, addr, errorcode)) {
 #ifdef DEBUG
-		        printk("do_page_fault() !=0 \n");
+		        printk(KERN_DEBUG "do_page_fault() !=0 \n");
 #endif
 			if (user_mode(&fp->ptregs)){
 				/* delay writebacks after signal delivery */
 #ifdef DEBUG
-			        printk(".. was usermode - return\n");
+			        printk(KERN_DEBUG ".. was usermode - return\n");
 #endif
 				return;
 			}
@@ -426,13 +426,13 @@
                          * the writeback won't do good)
 			 */
 #ifdef DEBUG
-			printk(".. disabling wb2\n");
+			printk(KERN_DEBUG ".. disabling wb2\n");
 #endif
 			if (fp->un.fmt7.wb2a == fp->un.fmt7.faddr)
 				fp->un.fmt7.wb2s &= ~WBV_040;
 		}
 	} else {
-		printk("68040 access error, ssw=%x\n", ssw);
+		printk(KERN_ERR "68040 access error, ssw=%x\n", ssw);
 		trap_c(fp);
 	}
 
@@ -456,13 +456,13 @@
 
 #if DEBUG
 	if (ssw & (FC | FB))
-		printk ("Instruction fault at %#010lx\n",
+		printk (KERN_DEBUG "Instruction fault at %#010lx\n",
 			ssw & FC ?
 			fp->ptregs.format == 0xa ? fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2
 			:
 			fp->ptregs.format == 0xa ? fp->ptregs.pc + 4 : fp->un.fmtb.baddr);
 	if (ssw & DF) 
-		printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n",
+		printk (KERN_DEBUG "Data %s fault at %#010lx in %s (pc=%#lx)\n",
 			ssw & RW ? "read" : "write",
 			fp->un.fmtb.daddr,
 			space_names[ssw & DFC], fp->ptregs.pc);
@@ -489,7 +489,7 @@
 			  return;
 			/* instruction fault or kernel data fault! */
 			if (ssw & (FC | FB))
-				printk ("Instruction fault at %#010lx\n",
+				printk (KERN_WARNING "Instruction fault at %#010lx\n",
 					fp->ptregs.pc);
 			if (ssw & DF) {
 				/* was this fault incurred testing bus mappings? */
@@ -499,12 +499,12 @@
 					return;
 				}
 
-				printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n",
+				printk (KERN_WARNING "Data %s fault at %#010lx in %s (pc=%#lx)\n",
 					ssw & RW ? "read" : "write",
 					fp->un.fmtb.daddr,
 					space_names[ssw & DFC], fp->ptregs.pc);
 			}
-			printk ("BAD KERNEL BUSERR\n");
+			printk (KERN_EMERG "BAD KERNEL BUSERR\n");
 
 			die_if_kernel("Oops", &fp->ptregs,0);
 			force_sig(SIGKILL, current);
@@ -534,8 +534,8 @@
 			errorcode = 0x00;
 		else {
 #ifdef DEBUG
-			printk ("*** unexpected busfault type=%#04x\n", buserr_type);
-			printk ("invalid %s access at %#lx from pc %#lx\n",
+			printk (KERN_DEBUG "*** unexpected busfault type=%#04x\n", buserr_type);
+			printk (KERN_DEBUG "invalid %s access at %#lx from pc %#lx\n",
 				!(ssw & RW) ? "write" : "read", addr,
 				fp->ptregs.pc);
 #endif
@@ -570,7 +570,7 @@
 			do_page_fault (&fp->ptregs, addr, 0);
        } else {
 #ifdef DEBUG
-		printk ("protection fault on insn access (segv).\n");
+		printk (KERN_DEBUG "protection fault on insn access (segv).\n");
 #endif
 		force_sig (SIGSEGV, current);
        }	
@@ -589,17 +589,17 @@
 #endif
 
 #if DEBUG
-	printk ("pid = %x  ", current->pid);
-	printk ("SSW=%#06x  ", ssw);
+	printk (KERN_DEBUG "pid = %x  ", current->pid);
+	printk (KERN_DEBUG "SSW=%#06x  ", ssw);
 
 	if (ssw & (FC | FB))
-		printk ("Instruction fault at %#010lx\n",
+		printk (KERN_DEBUG "Instruction fault at %#010lx\n",
 			ssw & FC ?
 			fp->ptregs.format == 0xa ? fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2
 			:
 			fp->ptregs.format == 0xa ? fp->ptregs.pc + 4 : fp->un.fmtb.baddr);
 	if (ssw & DF)
-		printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n",
+		printk (KERN_DEBUG "Data %s fault at %#010lx in %s (pc=%#lx)\n",
 			ssw & RW ? "read" : "write",
 			fp->un.fmtb.daddr,
 			space_names[ssw & DFC], fp->ptregs.pc);
@@ -610,15 +610,15 @@
 		if (! ((ssw & DF) && ((ssw & DFC) == USER_DATA))) {
 			/* instruction fault or kernel data fault! */
 			if (ssw & (FC | FB))
-				printk ("Instruction fault at %#010lx\n",
+				printk (KERN_EMERG "Instruction fault at %#010lx\n",
 					fp->ptregs.pc);
 			if (ssw & DF) {
-				printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n",
+				printk (KERN_EMERG "Data %s fault at %#010lx in %s (pc=%#lx)\n",
 					ssw & RW ? "read" : "write",
 					fp->un.fmtb.daddr,
 					space_names[ssw & DFC], fp->ptregs.pc);
 			}
-			printk ("BAD KERNEL BUSERR\n");
+			printk (KERN_EMERG "BAD KERNEL BUSERR\n");
 			die_if_kernel("Oops",&fp->ptregs,0);
 			force_sig(SIGKILL, current);
 			return;
@@ -630,7 +630,7 @@
 			panic ("USER BUSERR w/o instruction or data fault");
 		user_space_fault = 1;
 #if DEBUG
-		printk("User space bus-error\n");
+		printk(KERN_DEBUG "User space bus-error\n");
 #endif
 	}
 
@@ -658,9 +658,9 @@
 	    }
       
 #if DEBUG
-	    printk ("mmusr is %#x for addr %#lx in task %p\n",
+	    printk (KERN_DEBUG "mmusr is %#x for addr %#lx in task %p\n",
 		    mmusr, addr, current);
-	    printk ("descriptor address is %#lx, contents %#lx\n",
+	    printk (KERN_DEBUG "descriptor address is %#lx, contents %#lx\n",
 		    __va(desc), *(unsigned long *)__va(desc));
 #endif
 
@@ -674,7 +674,7 @@
 		if (do_page_fault (&fp->ptregs, addr, errorcode) < 0)
 			return;
 	    } else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
-		    printk ("invalid %s access at %#lx from pc %#lx\n",
+		    printk (KERN_EMERG "invalid %s access at %#lx from pc %#lx\n",
 			    !(ssw & RW) ? "write" : "read", addr,
 			    fp->ptregs.pc);
 		    die_if_kernel("Oops",&fp->ptregs,mmusr);
@@ -685,7 +685,7 @@
 		    static volatile long tlong;
 #endif
 
-		    printk ("weird %s access at %#lx from pc %#lx (ssw is %#x)\n",
+		    printk (KERN_EMERG "weird %s access at %#lx from pc %#lx (ssw is %#x)\n",
 			    !(ssw & RW) ? "write" : "read", addr,
 			    fp->ptregs.pc, ssw);
 		    asm volatile ("ptestr #1,%1@,#0\n\t"
@@ -694,19 +694,19 @@
 				  : "a" (&temp), "a" (addr));
 		    mmusr = temp;
 
-		    printk ("level 0 mmusr is %#x\n", mmusr);
+		    printk (KERN_EMERG "level 0 mmusr is %#x\n", mmusr);
 #if 0
 		    asm volatile ("pmove %/tt0,%0@"
 				  : /* no outputs */
 				  : "a" (&tlong));
-		    printk ("tt0 is %#lx, ", tlong);
+		    printk (KERN_EMERG "tt0 is %#lx, ", tlong);
 		    asm volatile ("pmove %/tt1,%0@"
 				  : /* no outputs */
 				  : "a" (&tlong));
-		    printk ("tt1 is %#lx\n", tlong);
+		    printk (KERN_EMERG "tt1 is %#lx\n", tlong);
 #endif
 #if DEBUG
-		    printk("Unknown SIGSEGV - 1\n");
+		    printk(KERN_DEBUG "Unknown SIGSEGV - 1\n");
 #endif
 		    die_if_kernel("Oops",&fp->ptregs,mmusr);
 		    force_sig(SIGSEGV, current);
@@ -756,19 +756,19 @@
 	}
       
 #ifdef DEBUG
-	printk ("mmusr is %#x for addr %#lx in task %p\n",
+	printk (KERN_DEBUG "mmusr is %#x for addr %#lx in task %p\n",
 		mmusr, addr, current);
-	printk ("descriptor address is %#lx, contents %#lx\n",
+	printk (KERN_DEBUG "descriptor address is %#lx, contents %#lx\n",
 		__va(desc), *(unsigned long *)__va(desc));
 #endif
 
 	if (mmusr & MMU_I)
 		do_page_fault (&fp->ptregs, addr, 0);
 	else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
-		printk ("invalid insn access at %#lx from pc %#lx\n",
+		printk (KERN_WARNING "invalid insn access at %#lx from pc %#lx\n",
 			addr, fp->ptregs.pc);
 #if DEBUG
-		printk("Unknown SIGSEGV - 2\n");
+		printk(KERN_DEBUG "Unknown SIGSEGV - 2\n");
 #endif
 		die_if_kernel("Oops",&fp->ptregs,mmusr);
 		force_sig(SIGSEGV, current);
@@ -790,7 +790,7 @@
 		current->thread.esp0 = (unsigned long) fp;
 
 #if DEBUG
-	printk ("*** Bus Error *** Format is %x\n", fp->ptregs.format);
+	printk (KERN_DEBUG "*** Bus Error *** Format is %x\n", fp->ptregs.format);
 #endif
 
 	switch (fp->ptregs.format) {
@@ -813,7 +813,7 @@
 	default:
 	  die_if_kernel("bad frame format",&fp->ptregs,0);
 #if DEBUG
-	  printk("Unknown SIGSEGV - 4\n");
+	  printk(KERN_DEBUG "Unknown SIGSEGV - 4\n");
 #endif
 	  force_sig(SIGSEGV, current);
 	}
@@ -828,7 +828,7 @@
 	unsigned long addr;
 	int i;
 
-	printk("Call Trace:");
+	printk(KERN_EMERG "Call Trace:");
 	addr = (unsigned long)stack + THREAD_SIZE - 1;
 	endstack = (unsigned long *)(addr & -THREAD_SIZE);
 	i = 0;
@@ -844,12 +844,12 @@
 		 */
 		if (kernel_text_address(addr)) {
 			if (i % 4 == 0)
-				printk("\n       ");
-			printk(" [<%08lx>]", addr);
+				printk(KERN_EMERG "\n       ");
+			printk(KERN_EMERG " [<%08lx>]", addr);
 			i++;
 		}
 	}
-	printk("\n");
+	printk(KERN_EMERG "\n");
 }
 
 void show_trace_task(struct task_struct *tsk)
@@ -864,63 +864,63 @@
 	int i;
 
 	addr = (unsigned long)&fp->un;
-	printk("Frame format=%X ", fp->ptregs.format);
+	printk(KERN_EMERG "Frame format=%X ", fp->ptregs.format);
 	switch (fp->ptregs.format) {
 	case 0x2:
-	    printk("instr addr=%08lx\n", fp->un.fmt2.iaddr);
+	    printk(KERN_EMERG "instr addr=%08lx\n", fp->un.fmt2.iaddr);
 	    addr += sizeof(fp->un.fmt2);
 	    break;
 	case 0x3:
-	    printk("eff addr=%08lx\n", fp->un.fmt3.effaddr);
+	    printk(KERN_EMERG "eff addr=%08lx\n", fp->un.fmt3.effaddr);
 	    addr += sizeof(fp->un.fmt3);
 	    break;
 	case 0x4:
-	    printk((CPU_IS_060 ? "fault addr=%08lx fslw=%08lx\n"
+	    printk(KERN_EMERG (CPU_IS_060 ? "fault addr=%08lx fslw=%08lx\n"
 		    : "eff addr=%08lx pc=%08lx\n"),
 		   fp->un.fmt4.effaddr, fp->un.fmt4.pc);
 	    addr += sizeof(fp->un.fmt4);
 	    break;
 	case 0x7:
-	    printk("eff addr=%08lx ssw=%04x faddr=%08lx\n",
+	    printk(KERN_EMERG "eff addr=%08lx ssw=%04x faddr=%08lx\n",
 		   fp->un.fmt7.effaddr, fp->un.fmt7.ssw, fp->un.fmt7.faddr);
-	    printk("wb 1 stat/addr/data: %04x %08lx %08lx\n",
+	    printk(KERN_EMERG "wb 1 stat/addr/data: %04x %08lx %08lx\n",
 		   fp->un.fmt7.wb1s, fp->un.fmt7.wb1a, fp->un.fmt7.wb1dpd0);
-	    printk("wb 2 stat/addr/data: %04x %08lx %08lx\n",
+	    printk(KERN_EMERG "wb 2 stat/addr/data: %04x %08lx %08lx\n",
 		   fp->un.fmt7.wb2s, fp->un.fmt7.wb2a, fp->un.fmt7.wb2d);
-	    printk("wb 3 stat/addr/data: %04x %08lx %08lx\n",
+	    printk(KERN_EMERG "wb 3 stat/addr/data: %04x %08lx %08lx\n",
 		   fp->un.fmt7.wb3s, fp->un.fmt7.wb3a, fp->un.fmt7.wb3d);
-	    printk("push data: %08lx %08lx %08lx %08lx\n",
+	    printk(KERN_EMERG "push data: %08lx %08lx %08lx %08lx\n",
 		   fp->un.fmt7.wb1dpd0, fp->un.fmt7.pd1, fp->un.fmt7.pd2,
 		   fp->un.fmt7.pd3);
 	    addr += sizeof(fp->un.fmt7);
 	    break;
 	case 0x9:
-	    printk("instr addr=%08lx\n", fp->un.fmt9.iaddr);
+	    printk(KERN_EMERG "instr addr=%08lx\n", fp->un.fmt9.iaddr);
 	    addr += sizeof(fp->un.fmt9);
 	    break;
 	case 0xa:
-	    printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",
+	    printk(KERN_EMERG "ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",
 		   fp->un.fmta.ssw, fp->un.fmta.isc, fp->un.fmta.isb,
 		   fp->un.fmta.daddr, fp->un.fmta.dobuf);
 	    addr += sizeof(fp->un.fmta);
 	    break;
 	case 0xb:
-	    printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",
+	    printk(KERN_EMERG "ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",
 		   fp->un.fmtb.ssw, fp->un.fmtb.isc, fp->un.fmtb.isb,
 		   fp->un.fmtb.daddr, fp->un.fmtb.dobuf);
-	    printk("baddr=%08lx dibuf=%08lx ver=%x\n",
+	    printk(KERN_EMERG "baddr=%08lx dibuf=%08lx ver=%x\n",
 		   fp->un.fmtb.baddr, fp->un.fmtb.dibuf, fp->un.fmtb.ver);
 	    addr += sizeof(fp->un.fmtb);
 	    break;
 	default:
-	    printk("\n");
+	    printk(KERN_EMERG "\n");
 	}
 	show_stack((unsigned long *)addr);
 
-	printk("Code: ");
+	printk(KERN_EMERG "Code: ");
 	for (i = 0; i < 10; i++)
-		printk("%04x ", 0xffff & ((short *) fp->ptregs.pc)[i]);
-	printk ("\n");
+		printk(KERN_EMERG "%04x ", 0xffff & ((short *) fp->ptregs.pc)[i]);
+	printk (KERN_EMERG "\n");
 }
 
 extern void show_stack(unsigned long *stack)
@@ -932,15 +932,15 @@
 		stack = (unsigned long *)&stack;
 	endstack = (unsigned long *)(((unsigned long)stack + THREAD_SIZE - 1) & -THREAD_SIZE);
 
-	printk("Stack from %08lx:", (unsigned long)stack);
+	printk(KERN_EMERG "Stack from %08lx:", (unsigned long)stack);
 	for (i = 0; i < kstack_depth_to_print; i++) {
 		if (stack + 1 > endstack)
 			break;
 		if (i % 8 == 0)
-			printk("\n       ");
-		printk(" %08lx", *stack++);
+			printk(KERN_EMERG "\n       ");
+		printk(KERN_EMERG " %08lx", *stack++);
 	}
-	printk("\n");
+	printk(KERN_EMERG "\n");
 	show_trace(stack);
 }
 
@@ -958,33 +958,33 @@
 {
 	console_verbose();
 	if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
-		printk ("*** %s ***   FORMAT=%X\n",
+		printk (KERN_EMERG "*** %s ***   FORMAT=%X\n",
 			vec_names[(fp->ptregs.vector) >> 2],
 			fp->ptregs.format);
 	else
-		printk ("*** Exception %d ***   FORMAT=%X\n",
+		printk (KERN_EMERG "*** Exception %d ***   FORMAT=%X\n",
 			(fp->ptregs.vector) >> 2, 
 			fp->ptregs.format);
 	if (fp->ptregs.vector >> 2 == VEC_ADDRERR && CPU_IS_020_OR_030) {
 		unsigned short ssw = fp->un.fmtb.ssw;
 
-		printk ("SSW=%#06x  ", ssw);
+		printk (KERN_EMERG "SSW=%#06x  ", ssw);
 
 		if (ssw & RC)
-			printk ("Pipe stage C instruction fault at %#010lx\n",
+			printk (KERN_EMERG "Pipe stage C instruction fault at %#010lx\n",
 				(fp->ptregs.format) == 0xA ?
 				fp->ptregs.pc + 2 : fp->un.fmtb.baddr - 2);
 		if (ssw & RB)
-			printk ("Pipe stage B instruction fault at %#010lx\n",
+			printk (KERN_EMERG "Pipe stage B instruction fault at %#010lx\n",
 				(fp->ptregs.format) == 0xA ?
 				fp->ptregs.pc + 4 : fp->un.fmtb.baddr);
 		if (ssw & DF)
-			printk ("Data %s fault at %#010lx in %s (pc=%#lx)\n",
+			printk (KERN_EMERG "Data %s fault at %#010lx in %s (pc=%#lx)\n",
 				ssw & RW ? "read" : "write",
 				fp->un.fmtb.daddr, space_names[ssw & DFC],
 				fp->ptregs.pc);
 	}
-	printk ("Current process id is %d\n", current->pid);
+	printk (KERN_EMERG "Current process id is %d\n", current->pid);
 	die_if_kernel("BAD KERNEL TRAP", &fp->ptregs, 0);
 }
 
@@ -1114,15 +1114,15 @@
 		return;
 
 	console_verbose();
-	printk("%s: %08x\n",str,nr);
-	printk("PC: [<%08lx>]\nSR: %04x  SP: %p  a2: %08lx\n",
+	printk(KERN_EMERG "%s: %08x\n",str,nr);
+	printk(KERN_EMERG "PC: [<%08lx>]\nSR: %04x  SP: %p  a2: %08lx\n",
 	       fp->pc, fp->sr, fp, fp->a2);
-	printk("d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",
+	printk(KERN_EMERG "d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",
 	       fp->d0, fp->d1, fp->d2, fp->d3);
-	printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
+	printk(KERN_EMERG "d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
 	       fp->d4, fp->d5, fp->a0, fp->a1);
 
-	printk("Process %s (pid: %d, stackpage=%08lx)\n",
+	printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
 		current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
 	show_stack((unsigned long *)fp);
 	do_exit(SIGSEGV);
diff -urN linux-2.6.0-test1/arch/m68k/mac/baboon.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/baboon.c
--- linux-2.6.0-test1/arch/m68k/mac/baboon.c	2003-07-13 23:36:33.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/baboon.c	2003-07-23 17:25:07.000000000 -0400
@@ -47,7 +47,7 @@
 	baboon_present = 1;
 	baboon_active = 0;
 
-	printk("Baboon detected at %p\n", baboon);
+	printk(KERN_INFO "Baboon detected at %p\n", baboon);
 }
 
 /*
@@ -70,7 +70,7 @@
 	unsigned char events;
 
 #ifdef DEBUG_IRQS
-	printk("baboon_irq: mb_control %02X mb_ifr %02X mb_status %02X active %02X\n",
+	printk(KERN_DEBUG "baboon_irq: mb_control %02X mb_ifr %02X mb_status %02X active %02X\n",
 		(uint) baboon->mb_control, (uint) baboon->mb_ifr,
 		(uint) baboon->mb_status,  baboon_active);
 #endif
@@ -98,7 +98,7 @@
 	int irq_idx	= IRQ_IDX(irq);
 
 #ifdef DEBUG_IRQUSE
-	printk("baboon_irq_enable(%d)\n", irq);
+	printk(KERN_DEBUG "baboon_irq_enable(%d)\n", irq);
 #endif
 	baboon_active |= (1 << irq_idx);
 }
@@ -107,7 +107,7 @@
 	int irq_idx	= IRQ_IDX(irq);
 
 #ifdef DEBUG_IRQUSE
-	printk("baboon_irq_disable(%d)\n", irq);
+	printk(KERN_DEBUG "baboon_irq_disable(%d)\n", irq);
 #endif
 	baboon_active &= ~(1 << irq_idx);
 }
diff -urN linux-2.6.0-test1/arch/m68k/mac/bootparse.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/bootparse.c
--- linux-2.6.0-test1/arch/m68k/mac/bootparse.c	2003-07-13 23:34:03.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/bootparse.c	2003-07-23 17:22:58.000000000 -0400
@@ -115,7 +115,7 @@
  		while(*env)
  			env++;
  		env++;
- 		printk("%s=%s\n", name,value);
+ 		printk(KERN_INFO "%s=%s\n", name,value);
  	}
  }
  
diff -urN linux-2.6.0-test1/arch/m68k/mac/debug.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/debug.c
--- linux-2.6.0-test1/arch/m68k/mac/debug.c	2003-07-13 23:38:39.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/debug.c	2003-07-23 19:10:48.000000000 -0400
@@ -65,12 +65,12 @@
 #endif
 
 #ifdef DEBUG_SERIAL
-	printk("debug: %d !\n", num);
+	printk(KERN_DEBUG "debug: %d !\n", num);
 #endif
 
 #ifdef DEBUG_SCREEN
 	if (!MACH_IS_MAC) {
-		/* printk("debug: %d !\n", num); */
+		/* printk(KERN_DEBUG "debug: %d !\n", num); */
 		return;
 	}
 
@@ -104,12 +104,12 @@
 #endif
 
 #ifdef DEBUG_SERIAL
-	printk("debug: #%ld !\n", addr);
+	printk(KERN_DEBUG "debug: #%ld !\n", addr);
 #endif
 
 #ifdef DEBUG_SCREEN
 	if (!MACH_IS_MAC) {
-		/* printk("debug: #%ld !\n", addr); */
+		/* printk(KERN_DEBUG "debug: #%ld !\n", addr); */
 		return;
 	}
 	
diff -urN linux-2.6.0-test1/arch/m68k/mac/iop.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/iop.c
--- linux-2.6.0-test1/arch/m68k/mac/iop.c	2003-07-13 23:38:06.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/iop.c	2003-07-23 19:10:22.000000000 -0400
@@ -278,10 +278,10 @@
 	int i;
 
 	if (iop_scc_present) {
-		printk("IOP: detected SCC IOP at %p\n", iop_base[IOP_NUM_SCC]);
+		printk(KERN_INFO "IOP: detected SCC IOP at %p\n", iop_base[IOP_NUM_SCC]);
 	}
 	if (iop_ism_present) {
-		printk("IOP: detected ISM IOP at %p\n", iop_base[IOP_NUM_ISM]);
+		printk(KERN_INFO "IOP: detected ISM IOP at %p\n", iop_base[IOP_NUM_ISM]);
 		iop_start(iop_base[IOP_NUM_ISM]);
 		iop_alive(iop_base[IOP_NUM_ISM]); /* clears the alive flag */
 	}
@@ -327,9 +327,9 @@
 					(void *) IOP_NUM_ISM);
 		}
 		if (!iop_alive(iop_base[IOP_NUM_ISM])) {
-			printk("IOP: oh my god, they killed the ISM IOP!\n");
+			printk(KERN_INFO "IOP: oh my god, they killed the ISM IOP!\n");
 		} else {
-			printk("IOP: the ISM IOP seems to be alive.\n");
+			printk(KERN_INFO "IOP: the ISM IOP seems to be alive.\n");
 		}
 	}
 }
@@ -367,7 +367,7 @@
 	int i,offset;
 
 #ifdef DEBUG_IOP
-	printk("iop_complete(%p): iop %d chan %d\n", msg, msg->iop_num, msg->channel);
+	printk(KERN_DEBUG "iop_complete(%p): iop %d chan %d\n", msg, msg->iop_num, msg->channel);
 #endif
 
 	offset = IOP_ADDR_RECV_MSG + (msg->channel * IOP_MSG_LEN);
@@ -415,7 +415,7 @@
 	int i,offset;
 
 #ifdef DEBUG_IOP
-	printk("iop_handle_send: iop %d channel %d\n", iop_num, chan);
+	printk(KERN_DEBUG "iop_handle_send: iop %d channel %d\n", iop_num, chan);
 #endif
 
 	iop_writeb(iop, IOP_ADDR_SEND_STATE + chan, IOP_MSG_IDLE);
@@ -448,7 +448,7 @@
 	struct iop_msg *msg;
 
 #ifdef DEBUG_IOP
-	printk("iop_handle_recv: iop %d channel %d\n", iop_num, chan);
+	printk(KERN_DEBUG "iop_handle_recv: iop %d channel %d\n", iop_num, chan);
 #endif
 
 	msg = iop_alloc_msg();
@@ -472,12 +472,12 @@
 		(*msg->handler)(msg, regs);
 	} else {
 #ifdef DEBUG_IOP
-		printk("iop_handle_recv: unclaimed message on iop %d channel %d\n", iop_num, chan);
-		printk("iop_handle_recv:");
+		printk(KERN_DEBUG "iop_handle_recv: unclaimed message on iop %d channel %d\n", iop_num, chan);
+		printk(KERN_DEBUG "iop_handle_recv:");
 		for (i = 0 ; i < IOP_MSG_LEN ; i++) {
-			printk(" %02X", (uint) msg->message[i]);
+			printk(KERN_DEBUG " %02X", (uint) msg->message[i]);
 		}
-		printk("\n");
+		printk(KERN_DEBUG "\n");
 #endif
 		iop_complete_message(msg);
 	}
@@ -592,7 +592,7 @@
 	int i,state;
 
 #ifdef DEBUG_IOP
-	printk("iop_ism_irq: status = %02X\n", (uint) iop->status_ctrl);
+	printk(KERN_DEBUG "iop_ism_irq: status = %02X\n", (uint) iop->status_ctrl);
 #endif
 
 	/* INT0 indicates a state change on an outgoing message channel */
@@ -600,40 +600,40 @@
 	if (iop->status_ctrl & IOP_INT0) {
 		iop->status_ctrl = IOP_INT0 | IOP_RUN | IOP_AUTOINC;
 #ifdef DEBUG_IOP
-		printk("iop_ism_irq: new status = %02X, send states",
+		printk(KERN_DEBUG "iop_ism_irq: new status = %02X, send states",
 			(uint) iop->status_ctrl);
 #endif
 		for (i = 0 ; i < NUM_IOP_CHAN  ; i++) {
 			state = iop_readb(iop, IOP_ADDR_SEND_STATE + i);
 #ifdef DEBUG_IOP
-			printk(" %02X", state);
+			printk(KERN_DEBUG " %02X", state);
 #endif
 			if (state == IOP_MSG_COMPLETE) {
 				iop_handle_send(iop_num, i, regs);
 			}
 		}
 #ifdef DEBUG_IOP
-		printk("\n");
+		printk(KERN_DEBUG "\n");
 #endif
 	}
 
 	if (iop->status_ctrl & IOP_INT1) {	/* INT1 for incoming msgs */
 		iop->status_ctrl = IOP_INT1 | IOP_RUN | IOP_AUTOINC;
 #ifdef DEBUG_IOP
-		printk("iop_ism_irq: new status = %02X, recv states",
+		printk(KERN_DEBUG "iop_ism_irq: new status = %02X, recv states",
 			(uint) iop->status_ctrl);
 #endif
 		for (i = 0 ; i < NUM_IOP_CHAN ; i++) {
 			state = iop_readb(iop, IOP_ADDR_RECV_STATE + i);
 #ifdef DEBUG_IOP
-			printk(" %02X", state);
+			printk(KERN_DEBUG " %02X", state);
 #endif
 			if (state == IOP_MSG_NEW) {
 				iop_handle_recv(iop_num, i, regs);
 			}
 		}
 #ifdef DEBUG_IOP
-		printk("\n");
+		printk(KERN_DEBUG "\n");
 #endif
 	}
 	return IRQ_HANDLED;
diff -urN linux-2.6.0-test1/arch/m68k/mac/macints.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/macints.c
--- linux-2.6.0-test1/arch/m68k/mac/macints.c	2003-07-13 23:37:23.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/macints.c	2003-07-23 19:08:33.000000000 -0400
@@ -228,7 +228,7 @@
         int i;
 
 #ifdef DEBUG_MACINTS
-	printk("mac_init_IRQ(): Setting things up...\n");
+	printk(KERN_DEBUG "mac_init_IRQ(): Setting things up...\n");
 #endif
 	/* Initialize the IRQ handler lists. Initially each list is empty, */
 
@@ -240,13 +240,13 @@
 
 	/* Make sure the SONIC interrupt is cleared or things get ugly */
 #ifdef SHUTUP_SONIC
-	printk("Killing onboard sonic... ");
+	printk(KERN_NOTICE "Killing onboard sonic... ");
 	/* This address should hopefully be mapped already */
 	if (hwreg_present((void*)(0x50f0a000))) {
 		*(long *)(0x50f0a014) = 0x7fffL;
 		*(long *)(0x50f0a010) = 0L;
 	}
-	printk("Done.\n");
+	printk(KERN_NOTICE "Done.\n");
 #endif /* SHUTUP_SONIC */
 
 	/* 
@@ -264,7 +264,7 @@
 	iop_register_interrupts();
 	sys_request_irq(7, mac_nmi_handler, IRQ_FLG_LOCK, "NMI", mac_nmi_handler);
 #ifdef DEBUG_MACINTS
-	printk("mac_init_IRQ(): Done!\n");
+	printk(KERN_DEBUG "mac_init_IRQ(): Done!\n");
 #endif
 }
 
@@ -279,7 +279,7 @@
 	irq_node_t *cur;
 
 	if (!node->dev_id)
-		printk("%s: Warning: dev_id of %s is zero\n",
+		printk(KERN_WARNING "%s: Warning: dev_id of %s is zero\n",
 		       __FUNCTION__, node->devname);
 
 	local_irq_save(flags);
@@ -327,7 +327,7 @@
 		}
 	}
 	local_irq_restore(flags);
-	printk ("%s: tried to remove invalid irq\n", __FUNCTION__);
+	printk (KERN_WARNING "%s: tried to remove invalid irq\n", __FUNCTION__);
 }
 
 /*
@@ -346,7 +346,7 @@
 
 #ifdef DEBUG_SPURIOUS
 	if (!mac_irq_list[irq] && (console_loglevel > 7)) {
-		printk("mac_do_irq_list: spurious interrupt %d!\n", irq);
+		printk(KERN_DEBUG "mac_do_irq_list: spurious interrupt %d!\n", irq);
 		return;
 	}
 #endif
@@ -504,7 +504,7 @@
 	irq_node_t *node;
 
 #ifdef DEBUG_MACINTS
-	printk ("%s: irq %d requested for %s\n", __FUNCTION__, irq, devname);
+	printk (KERN_DEBUG "%s: irq %d requested for %s\n", __FUNCTION__, irq, devname);
 #endif
 
 	if (irq < VIA1_SOURCE_BASE) {
@@ -512,7 +512,7 @@
 	}
 
 	if (irq >= NUM_MAC_SOURCES) {
-		printk ("%s: unknown irq %d requested by %s\n",
+		printk (KERN_WARNING "%s: unknown irq %d requested by %s\n",
 		        __FUNCTION__, irq, devname);
 	}
 
@@ -541,7 +541,7 @@
 void mac_free_irq(unsigned int irq, void *dev_id)
 {
 #ifdef DEBUG_MACINTS
-	printk ("%s: irq %d freed by %p\n", __FUNCTION__, irq, dev_id);
+	printk (KERN_DEBUG "%s: irq %d freed by %p\n", __FUNCTION__, irq, dev_id);
 #endif
 
 	if (irq < VIA1_SOURCE_BASE) {
@@ -549,7 +549,7 @@
 	}
 
 	if (irq >= NUM_MAC_SOURCES) {
-		printk ("%s: unknown irq %d freed\n",
+		printk (KERN_ERR "%s: unknown irq %d freed\n",
 		        __FUNCTION__, irq);
 		return;
 	}
@@ -640,7 +640,7 @@
 void mac_default_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
 #ifdef DEBUG_SPURIOUS
-	printk("Unexpected IRQ %d on device %p\n", irq, dev_id);
+	printk(KERN_DEBUG "Unexpected IRQ %d on device %p\n", irq, dev_id);
 #endif
 }
 
@@ -649,7 +649,7 @@
 irqreturn_t mac_debug_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
 	if (num_debug[irq] < 10) {
-		printk("DEBUG: Unexpected IRQ %d\n", irq);
+		printk(KERN_DEBUG "DEBUG: Unexpected IRQ %d\n", irq);
 		num_debug[irq]++;
 	}
 	return IRQ_HANDLED;
@@ -672,9 +672,9 @@
 
 	if (in_nmi == 1) {
 		nmi_hold = 1;
-		printk("... pausing, press NMI to resume ...");
+		printk(KERN_NOTICE "... pausing, press NMI to resume ...");
 	} else {
-		printk(" ok!\n");
+		printk(KERN_NOTICE " ok!\n");
 		nmi_hold = 0;
 	}
 
@@ -686,15 +686,15 @@
 	if ( console_loglevel >= 8 ) {
 #if 0
 		show_state();
-		printk("PC: %08lx\nSR: %04x  SP: %p\n", fp->pc, fp->sr, fp);
-		printk("d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",
+		printk(KERN_EMERG "PC: %08lx\nSR: %04x  SP: %p\n", fp->pc, fp->sr, fp);
+		printk(KERN_EMERG "d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",
 		       fp->d0, fp->d1, fp->d2, fp->d3);
-		printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
+		printk(KERN_EMERG "d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
 		       fp->d4, fp->d5, fp->a0, fp->a1);
 	
 		if (STACK_MAGIC != *(unsigned long *)current->kernel_stack_page)
-			printk("Corrupted stack page\n");
-		printk("Process %s (pid: %d, stackpage=%08lx)\n",
+			printk(KERN_EMERG "Corrupted stack page\n");
+		printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
 			current->comm, current->pid, current->kernel_stack_page);
 		if (intr_count == 1)
 			dump_stack((struct frame *)fp);
diff -urN linux-2.6.0-test1/arch/m68k/mac/misc.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/misc.c
--- linux-2.6.0-test1/arch/m68k/mac/misc.c	2003-07-13 23:34:32.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/misc.c	2003-07-23 17:23:41.000000000 -0400
@@ -227,7 +227,7 @@
 	ct = 0;
 	do {
 		if (++ct > 10) {
-			printk("via_read_time: couldn't get valid time, "
+			printk(KERN_WARNING "via_read_time: couldn't get valid time, "
 			       "last read = 0x%08lx and 0x%08lx\n",
 			       last_result.idata, result.idata);
 			break;
@@ -405,7 +405,7 @@
 #endif
 	}
 	local_irq_enable();
-	printk("It is now safe to turn off your Macintosh.\n");
+	printk(KERN_ALERT "It is now safe to turn off your Macintosh.\n");
 	while(1);
 }
 
@@ -494,7 +494,7 @@
 
 	/* should never get here */
 	local_irq_enable();
-	printk ("Restart failed.  Please restart manually.\n");
+	printk (KERN_ALERT "Restart failed.  Please restart manually.\n");
 	while(1);
 }
 
@@ -595,10 +595,10 @@
 		unmktime(now, 0,
 			 &t->tm_year, &t->tm_mon, &t->tm_mday,
 			 &t->tm_hour, &t->tm_min, &t->tm_sec);
-		printk("mac_hwclk: read %04d-%02d-%-2d %02d:%02d:%02d\n",
+		printk(KERN_NOTICE "mac_hwclk: read %04d-%02d-%-2d %02d:%02d:%02d\n",
 			t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
 	} else { /* write */
-		printk("mac_hwclk: tried to write %04d-%02d-%-2d %02d:%02d:%02d\n",
+		printk(KERN_NOTICE "mac_hwclk: tried to write %04d-%02d-%-2d %02d:%02d:%02d\n",
 			t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
 
 #if 0	/* it trashes my rtc */
diff -urN linux-2.6.0-test1/arch/m68k/mac/oss.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/oss.c
--- linux-2.6.0-test1/arch/m68k/mac/oss.c	2003-07-13 23:34:02.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/oss.c	2003-07-23 17:22:38.000000000 -0400
@@ -102,7 +102,7 @@
 
 #ifdef DEBUG_IRQS	
 	if ((console_loglevel == 10) && !(events & OSS_IP_SCSI)) {
-		printk("oss_irq: irq %d events = 0x%04X\n", irq,
+		printk(KERN_DEBUG "oss_irq: irq %d events = 0x%04X\n", irq,
 			(int) oss->irq_pending);
 	}
 #endif
@@ -138,7 +138,7 @@
 
 #ifdef DEBUG_NUBUS_INT
 	if (console_loglevel > 7) {
-		printk("oss_nubus_irq: events = 0x%04X\n", events);
+		printk(KERN_DEBUG "oss_nubus_irq: events = 0x%04X\n", events);
 	}
 #endif
 	/* There are only six slots on the OSS, not seven */
@@ -165,7 +165,7 @@
 
 void oss_irq_enable(int irq) {
 #ifdef DEBUG_IRQUSE
-	printk("oss_irq_enable(%d)\n", irq);
+	printk(KERN_DEBUG "oss_irq_enable(%d)\n", irq);
 #endif
 	switch(irq) {
 		case IRQ_SCC:
@@ -190,7 +190,7 @@
 			break;
 #ifdef DEBUG_IRQUSE
 		default:
-			printk("%s unknown irq %d\n",__FUNCTION__, irq);
+			printk(KERN_DEBUG "%s unknown irq %d\n",__FUNCTION__, irq);
 			break;
 #endif
 	}
@@ -205,7 +205,7 @@
 
 void oss_irq_disable(int irq) {
 #ifdef DEBUG_IRQUSE
-	printk("oss_irq_disable(%d)\n", irq);
+	printk(KERN_DEBUG "oss_irq_disable(%d)\n", irq);
 #endif
 	switch(irq) {
 		case IRQ_SCC:
@@ -230,7 +230,7 @@
 			break;
 #ifdef DEBUG_IRQUSE
 		default:
-			printk("%s unknown irq %d\n", __FUNCTION__, irq);
+			printk(KERN_DEBUG "%s unknown irq %d\n", __FUNCTION__, irq);
 			break;
 #endif
 	}
diff -urN linux-2.6.0-test1/arch/m68k/mac/psc.c linux-2.6.0-test1-printk-m68k/arch/m68k/mac/psc.c
--- linux-2.6.0-test1/arch/m68k/mac/psc.c	2003-07-13 23:34:42.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mac/psc.c	2003-07-23 17:24:19.000000000 -0400
@@ -42,7 +42,7 @@
 
 	if (!psc_present) return;
 	for (i = 0x30 ; i < 0x70 ; i += 0x10) {
-		printk("PSC #%d:  IFR = 0x%02X IER = 0x%02X\n",
+		printk(KERN_EMERG "PSC #%d:  IFR = 0x%02X IER = 0x%02X\n",
 			i >> 4,
 			(int) psc_read_byte(pIFRbase + i),
 			(int) psc_read_byte(pIERbase + i));
@@ -59,14 +59,14 @@
 {
 	int i;
 
-	printk("Killing all PSC DMA channels...");
+	printk(KERN_EMERG "Killing all PSC DMA channels...");
 	for (i = 0 ; i < 9 ; i++) {
 		psc_write_word(PSC_CTL_BASE + (i << 4), 0x8800);
 		psc_write_word(PSC_CTL_BASE + (i << 4), 0x1000);
 		psc_write_word(PSC_CMD_BASE + (i << 5), 0x1100);
 		psc_write_word(PSC_CMD_BASE + (i << 5) + 0x10, 0x1100);
 	}
-	printk("done!\n");
+	printk(KERN_EMERG "done!\n");
 }
 
 /*
@@ -94,7 +94,7 @@
 	psc = (void *) PSC_BASE;
 	psc_present = 1;
 
-	printk("PSC detected at %p\n", psc);
+	printk(KERN_EMERG "PSC detected at %p\n", psc);
 
 	psc_dma_die_die_die();
 
@@ -142,7 +142,7 @@
 	base_irq = irq << 3;
 
 #ifdef DEBUG_IRQS
-	printk("psc_irq: irq %d pIFR = 0x%02X pIER = 0x%02X\n",
+	printk(KERN_DEBUG "psc_irq: irq %d pIFR = 0x%02X pIER = 0x%02X\n",
 		irq, (int) psc_read_byte(pIFR), (int) psc_read_byte(pIER));
 #endif
 
@@ -167,7 +167,7 @@
 	int pIER	= pIERbase + (irq_src << 4);
 
 #ifdef DEBUG_IRQUSE
-	printk("psc_irq_enable(%d)\n", irq);
+	printk(KERN_DEBUG "psc_irq_enable(%d)\n", irq);
 #endif
 	psc_write_byte(pIER, (1 << irq_idx) | 0x80);
 }
@@ -178,7 +178,7 @@
 	int pIER	= pIERbase + (irq_src << 4);
 
 #ifdef DEBUG_IRQUSE
-	printk("psc_irq_disable(%d)\n", irq);
+	printk(KERN_DEBUG "psc_irq_disable(%d)\n", irq);
 #endif
 	psc_write_byte(pIER, 1 << irq_idx);
 }
diff -urN linux-2.6.0-test1/arch/m68k/math-emu/multi_arith.h linux-2.6.0-test1-printk-m68k/arch/m68k/math-emu/multi_arith.h
--- linux-2.6.0-test1/arch/m68k/math-emu/multi_arith.h	2003-07-13 23:33:11.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/math-emu/multi_arith.h	2003-07-23 16:59:12.000000000 -0400
@@ -73,7 +73,7 @@
 
 extern inline void put_i128(const int128 a)
 {
-	printk("%08x %08x %08x %08x\n", a[MSW128], a[NMSW128],
+	printk(KERN_WARNING "%08x %08x %08x %08x\n", a[MSW128], a[NMSW128],
 	       a[NLSW128], a[LSW128]);
 }
 
diff -urN linux-2.6.0-test1/arch/m68k/mm/fault.c linux-2.6.0-test1-printk-m68k/arch/m68k/mm/fault.c
--- linux-2.6.0-test1/arch/m68k/mm/fault.c	2003-07-13 23:33:47.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mm/fault.c	2003-07-23 17:18:09.000000000 -0400
@@ -28,7 +28,7 @@
 	siginfo.si_code = current->thread.code;
 	siginfo.si_addr = (void *)current->thread.faddr;
 #ifdef DEBUG
-	printk("send_fault_sig: %p,%d,%d\n", siginfo.si_addr, siginfo.si_signo, siginfo.si_code);
+	printk(KERN_DEBUG "send_fault_sig: %p,%d,%d\n", siginfo.si_addr, siginfo.si_signo, siginfo.si_code);
 #endif
 
 	if (user_mode(regs)) {
@@ -63,7 +63,7 @@
 			printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
 		else
 			printk(KERN_ALERT "Unable to handle kernel access");
-		printk(" at virtual address %p\n", siginfo.si_addr);
+		printk(KERN_ALERT " at virtual address %p\n", siginfo.si_addr);
 		die_if_kernel("Oops", regs, 0 /*error_code*/);
 		do_exit(SIGKILL);
 	}
@@ -90,7 +90,7 @@
 	int write, fault;
 
 #ifdef DEBUG
-	printk ("do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n",
+	printk (KERN_DEBUG "do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n",
 		regs->sr, regs->pc, address, error_code,
 		current->mm->pgd);
 #endif
@@ -130,7 +130,7 @@
  */
 good_area:
 #ifdef DEBUG
-	printk("do_page_fault: good_area\n");
+	printk(KERN_DEBUG "do_page_fault: good_area\n");
 #endif
 	write = 0;
 	switch (error_code & 3) {
@@ -157,7 +157,7 @@
  survive:
 	fault = handle_mm_fault(mm, vma, address, write);
 #ifdef DEBUG
- 	printk("handle_mm_fault returns %d\n",fault);
+ 	printk(KERN_DEBUG "handle_mm_fault returns %d\n",fault);
 #endif
 	switch (fault) {
 	case 1:
@@ -187,7 +187,7 @@
 		goto survive;
 	}
 	
-	printk("VM: killing process %s\n", current->comm);
+	printk(KERN_WARNING "VM: killing process %s\n", current->comm);
 	if (user_mode(regs))
 		do_exit(SIGKILL);
 
diff -urN linux-2.6.0-test1/arch/m68k/mm/init.c linux-2.6.0-test1-printk-m68k/arch/m68k/mm/init.c
--- linux-2.6.0-test1/arch/m68k/mm/init.c	2003-07-13 23:37:27.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mm/init.c	2003-07-23 17:20:21.000000000 -0400
@@ -48,9 +48,9 @@
     int free = 0, total = 0, reserved = 0, shared = 0;
     int cached = 0;
 
-    printk("\nMem-info:\n");
+    printk(KERN_INFO "\nMem-info:\n");
     show_free_areas();
-    printk("Free swap:       %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
+    printk(KERN_INFO "Free swap:       %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
     i = max_mapnr;
     while (i-- > 0) {
 	total++;
@@ -63,11 +63,11 @@
 	else
 	    shared += page_count(mem_map+i) - 1;
     }
-    printk("%d pages of RAM\n",total);
-    printk("%d free pages\n",free);
-    printk("%d reserved pages\n",reserved);
-    printk("%d pages shared\n",shared);
-    printk("%d pages swap cached\n",cached);
+    printk(KERN_INFO "%d pages of RAM\n",total);
+    printk(KERN_INFO "%d free pages\n",free);
+    printk(KERN_INFO "%d reserved pages\n",reserved);
+    printk(KERN_INFO "%d pages shared\n",shared);
+    printk(KERN_INFO "%d pages swap cached\n",cached);
 }
 
 extern void init_pointer_table(unsigned long ptable);
@@ -124,7 +124,7 @@
 		init_pointer_table((unsigned long)zero_pgtable);
 #endif
 
-	printk("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n",
+	printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n",
 	       (unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
 	       max_mapnr << (PAGE_SHIFT-10),
 	       codepages << (PAGE_SHIFT-10),
@@ -143,6 +143,6 @@
 		totalram_pages++;
 		pages++;
 	}
-	printk ("Freeing initrd memory: %dk freed\n", pages);
+	printk (KERN_INFO "Freeing initrd memory: %dk freed\n", pages);
 }
 #endif
diff -urN linux-2.6.0-test1/arch/m68k/mm/kmap.c linux-2.6.0-test1-printk-m68k/arch/m68k/mm/kmap.c
--- linux-2.6.0-test1/arch/m68k/mm/kmap.c	2003-07-13 23:38:48.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mm/kmap.c	2003-07-23 17:21:14.000000000 -0400
@@ -126,7 +126,7 @@
 #endif
 
 #ifdef DEBUG
-	printk("ioremap: 0x%lx,0x%lx(%d) - ", physaddr, size, cacheflag);
+	printk(KERN_DEBUG "ioremap: 0x%lx,0x%lx(%d) - ", physaddr, size, cacheflag);
 #endif
 	/*
 	 * Mappings have to be aligned
@@ -145,7 +145,7 @@
 	virtaddr = (unsigned long)area->addr;
 	retaddr = virtaddr + offset;
 #ifdef DEBUG
-	printk("0x%lx,0x%lx,0x%lx", physaddr, virtaddr, retaddr);
+	printk(KERN_DEBUG "0x%lx,0x%lx,0x%lx", physaddr, virtaddr, retaddr);
 #endif
 
 	/*
@@ -186,12 +186,12 @@
 	while ((long)size > 0) {
 #ifdef DEBUG
 		if (!(virtaddr & (PTRTREESIZE-1)))
-			printk ("\npa=%#lx va=%#lx ", physaddr, virtaddr);
+			printk (KERN_DEBUG "\npa=%#lx va=%#lx ", physaddr, virtaddr);
 #endif
 		pgd_dir = pgd_offset_k(virtaddr);
 		pmd_dir = pmd_alloc(&init_mm, pgd_dir, virtaddr);
 		if (!pmd_dir) {
-			printk("ioremap: no mem for pmd_dir\n");
+			printk(KERN_ERR "ioremap: no mem for pmd_dir\n");
 			return NULL;
 		}
 
@@ -203,7 +203,7 @@
 		} else {
 			pte_dir = pte_alloc_kernel(&init_mm, pmd_dir, virtaddr);
 			if (!pte_dir) {
-				printk("ioremap: no mem for pte_dir\n");
+				printk(KERN_ERR "ioremap: no mem for pte_dir\n");
 				return NULL;
 			}
 
@@ -214,7 +214,7 @@
 		}
 	}
 #ifdef DEBUG
-	printk("\n");
+	printk(KERN_DEBUG "\n");
 #endif
 	flush_tlb_all();
 
@@ -251,7 +251,7 @@
 	while ((long)size > 0) {
 		pgd_dir = pgd_offset_k(virtaddr);
 		if (pgd_bad(*pgd_dir)) {
-			printk("iounmap: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
+			printk(KERN_ERR "iounmap: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
 			pgd_clear(pgd_dir);
 			return;
 		}
@@ -269,7 +269,7 @@
 		}
 
 		if (pmd_bad(*pmd_dir)) {
-			printk("iounmap: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
+			printk(KERN_ERR "iounmap: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
 			pmd_clear(pmd_dir);
 			return;
 		}
@@ -327,7 +327,7 @@
 	while ((long)size > 0) {
 		pgd_dir = pgd_offset_k(virtaddr);
 		if (pgd_bad(*pgd_dir)) {
-			printk("iocachemode: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
+			printk(KERN_ERR "iocachemode: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
 			pgd_clear(pgd_dir);
 			return;
 		}
@@ -346,7 +346,7 @@
 		}
 
 		if (pmd_bad(*pmd_dir)) {
-			printk("iocachemode: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
+			printk(KERN_ERR "iocachemode: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
 			pmd_clear(pmd_dir);
 			return;
 		}
diff -urN linux-2.6.0-test1/arch/m68k/mm/memory.c linux-2.6.0-test1-printk-m68k/arch/m68k/mm/memory.c
--- linux-2.6.0-test1/arch/m68k/mm/memory.c	2003-07-13 23:35:53.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mm/memory.c	2003-07-23 17:19:03.000000000 -0400
@@ -53,7 +53,7 @@
 
 	PD_MARKBITS(dp) &= ~mask;
 #ifdef DEBUG
-	printk("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
+	printk(KERN_DEBUG "init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
 #endif
 
 	/* unreserve the page so it's possible to free that page */
@@ -150,7 +150,7 @@
 	do {
 		if (voff < m68k_memory[i].size) {
 #ifdef DEBUGPV
-			printk ("VTOP(%p)=%lx\n", vaddr,
+			printk (KERN_DEBUG "VTOP(%p)=%lx\n", vaddr,
 				m68k_memory[i].addr + voff);
 #endif
 			return m68k_memory[i].addr + voff;
@@ -176,7 +176,7 @@
 		poff = paddr - m68k_memory[i].addr;
 		if (poff < m68k_memory[i].size) {
 #ifdef DEBUGPV
-			printk ("PTOV(%lx)=%lx\n", paddr, poff + voff);
+			printk (KERN_DEBUG "PTOV(%lx)=%lx\n", paddr, poff + voff);
 #endif
 			return poff + voff;
 		}
@@ -186,7 +186,7 @@
 #if DEBUG_INVALID_PTOV
 	if (mm_inv_cnt > 0) {
 		mm_inv_cnt--;
-		printk("Invalid use of phys_to_virt(0x%lx) at 0x%p!\n",
+		printk(KERN_DEBUG "Invalid use of phys_to_virt(0x%lx) at 0x%p!\n",
 			paddr, __builtin_return_address(0));
 	}
 #endif
diff -urN linux-2.6.0-test1/arch/m68k/mm/motorola.c linux-2.6.0-test1-printk-m68k/arch/m68k/mm/motorola.c
--- linux-2.6.0-test1/arch/m68k/mm/motorola.c	2003-07-13 23:34:43.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mm/motorola.c	2003-07-23 17:18:47.000000000 -0400
@@ -83,7 +83,7 @@
 
 		last_pgtable = (pmd_t *)last;
 #ifdef DEBUG
-		printk("kernel_ptr_init: %p\n", last_pgtable);
+		printk(KERN_DEBUG "kernel_ptr_init: %p\n", last_pgtable);
 #endif
 	}
 
@@ -119,7 +119,7 @@
 	while (size > 0) {
 #ifdef DEBUG
 		if (!(virtaddr & (PTRTREESIZE-1)))
-			printk ("\npa=%#lx va=%#lx ", physaddr & PAGE_MASK,
+			printk (KERN_DEBUG "\npa=%#lx va=%#lx ", physaddr & PAGE_MASK,
 				virtaddr);
 #endif
 		pgd_dir = pgd_offset_k(virtaddr);
@@ -127,7 +127,7 @@
 			if (!(virtaddr & (ROOTTREESIZE-1)) &&
 			    size >= ROOTTREESIZE) {
 #ifdef DEBUG
-				printk ("[very early term]");
+				printk (KERN_DEBUG "[very early term]");
 #endif
 				pgd_val(*pgd_dir) = physaddr;
 				size -= ROOTTREESIZE;
@@ -139,7 +139,7 @@
 		if (!pgd_present(*pgd_dir)) {
 			pmd_dir = kernel_ptr_table();
 #ifdef DEBUG
-			printk ("[new pointer %p]", pmd_dir);
+			printk (KERN_DEBUG "[new pointer %p]", pmd_dir);
 #endif
 			pgd_set(pgd_dir, pmd_dir);
 		} else
@@ -148,14 +148,14 @@
 		if (CPU_IS_020_OR_030) {
 			if (virtaddr) {
 #ifdef DEBUG
-				printk ("[early term]");
+				printk (KERN_DEBUG "[early term]");
 #endif
 				pmd_dir->pmd[(virtaddr/PTRTREESIZE) & 15] = physaddr;
 				physaddr += PTRTREESIZE;
 			} else {
 				int i;
 #ifdef DEBUG
-				printk ("[zero map]");
+				printk (KERN_DEBUG "[zero map]");
 #endif
 				zero_pgtable = kernel_ptr_table();
 				pte_dir = (pte_t *)zero_pgtable;
@@ -171,7 +171,7 @@
 		} else {
 			if (!pmd_present(*pmd_dir)) {
 #ifdef DEBUG
-				printk ("[new table]");
+				printk (KERN_DEBUG "[new table]");
 #endif
 				pte_dir = kernel_page_table();
 				pmd_set(pmd_dir, pte_dir);
@@ -190,7 +190,7 @@
 
 	}
 #ifdef DEBUG
-	printk("\n");
+	printk(KERN_DEBUG "\n");
 #endif
 
 	return virtaddr;
@@ -209,7 +209,7 @@
 #ifdef DEBUG
 	{
 		extern unsigned long availmem;
-		printk ("start of paging_init (%p, %lx, %lx, %lx)\n",
+		printk (KERN_DEBUG "start of paging_init (%p, %lx, %lx, %lx)\n",
 			kernel_pg_dir, availmem, start_mem, end_mem);
 	}
 #endif
@@ -250,8 +250,8 @@
 
 	flush_tlb_all();
 #ifdef DEBUG
-	printk ("memory available is %ldKB\n", mem_avail >> 10);
-	printk ("start_mem is %#lx\nvirtual_end is %#lx\n",
+	printk (KERN_DEBUG "memory available is %ldKB\n", mem_avail >> 10);
+	printk (KERN_DEBUG "start_mem is %#lx\nvirtual_end is %#lx\n",
 		start_mem, end_mem);
 #endif
 
@@ -268,7 +268,7 @@
 	set_fs(KERNEL_DS);
 
 #ifdef DEBUG
-	printk ("before free_area_init\n");
+	printk (KERN_DEBUG "before free_area_init\n");
 #endif
 	zones_size[0] = (mach_max_dma_address < (unsigned long)high_memory ?
 			 mach_max_dma_address : (unsigned long)high_memory);
diff -urN linux-2.6.0-test1/arch/m68k/mm/sun3kmap.c linux-2.6.0-test1-printk-m68k/arch/m68k/mm/sun3kmap.c
--- linux-2.6.0-test1/arch/m68k/mm/sun3kmap.c	2003-07-13 23:38:49.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mm/sun3kmap.c	2003-07-23 17:21:28.000000000 -0400
@@ -79,7 +79,7 @@
 		return NULL;
 
 #ifdef SUN3_KMAP_DEBUG
-	printk("ioremap: got virt %p size %lx(%lx)\n", 
+	printk(KERN_DEBUG "ioremap: got virt %p size %lx(%lx)\n", 
 	       area->addr, size, area->size);
 #endif
 
diff -urN linux-2.6.0-test1/arch/m68k/mvme147/147ints.c linux-2.6.0-test1-printk-m68k/arch/m68k/mvme147/147ints.c
--- linux-2.6.0-test1/arch/m68k/mvme147/147ints.c	2003-07-13 23:32:33.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mvme147/147ints.c	2003-07-23 17:12:59.000000000 -0400
@@ -64,17 +64,17 @@
                 unsigned long flags, const char *devname, void *dev_id)
 {
 	if (irq > 255) {
-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
+		printk(KERN_ERR "%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
 		return -ENXIO;
 	}
 	if (!(irq_tab[irq].flags & IRQ_FLG_STD)) {
 		if (irq_tab[irq].flags & IRQ_FLG_LOCK) {
-			printk("%s: IRQ %d from %s is not replaceable\n",
+			printk(KERN_ERR "%s: IRQ %d from %s is not replaceable\n",
 			       __FUNCTION__, irq, irq_tab[irq].devname);
 			return -EBUSY;
 		}
 		if (flags & IRQ_FLG_REPLACE) {
-			printk("%s: %s can't replace IRQ %d from %s\n",
+			printk(KERN_ERR "%s: %s can't replace IRQ %d from %s\n",
 			       __FUNCTION__, devname, irq, irq_tab[irq].devname);
 			return -EBUSY;
 		}
@@ -89,11 +89,11 @@
 void mvme147_free_irq(unsigned int irq, void *dev_id)
 {
 	if (irq > 255) {
-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+		printk(KERN_ERR "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
 		return;
 	}
 	if (irq_tab[irq].dev_id != dev_id)
-		printk("%s: Removing probably wrong IRQ %d from %s\n",
+		printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
 		       __FUNCTION__, irq, irq_tab[irq].devname);
 
 	irq_tab[irq].handler = mvme147_defhand;
@@ -105,7 +105,7 @@
 irqreturn_t mvme147_process_int (unsigned long vec, struct pt_regs *fp)
 {
 	if (vec > 255) {
-		printk ("mvme147_process_int: Illegal vector %ld\n", vec);
+		printk (KERN_ERR "mvme147_process_int: Illegal vector %ld\n", vec);
 		return IRQ_NONE;
 	} else {
 		irq_tab[vec].count++;
@@ -130,7 +130,7 @@
 
 static irqreturn_t mvme147_defhand (int irq, void *dev_id, struct pt_regs *fp)
 {
-	printk ("Unknown interrupt 0x%02x\n", irq);
+	printk (KERN_WARNING "Unknown interrupt 0x%02x\n", irq);
 	return IRQ_NONE;
 }
 
diff -urN linux-2.6.0-test1/arch/m68k/mvme16x/16xints.c linux-2.6.0-test1-printk-m68k/arch/m68k/mvme16x/16xints.c
--- linux-2.6.0-test1/arch/m68k/mvme16x/16xints.c	2003-07-13 23:38:00.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/mvme16x/16xints.c	2003-07-23 17:22:11.000000000 -0400
@@ -64,18 +64,18 @@
                 unsigned long flags, const char *devname, void *dev_id)
 {
 	if (irq < 64 || irq > 255) {
-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
+		printk(KERN_ERR "%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
 		return -ENXIO;
 	}
 
 	if (!(irq_tab[irq-64].flags & IRQ_FLG_STD)) {
 		if (irq_tab[irq-64].flags & IRQ_FLG_LOCK) {
-			printk("%s: IRQ %d from %s is not replaceable\n",
+			printk(KERN_ERR "%s: IRQ %d from %s is not replaceable\n",
 			       __FUNCTION__, irq, irq_tab[irq-64].devname);
 			return -EBUSY;
 		}
 		if (flags & IRQ_FLG_REPLACE) {
-			printk("%s: %s can't replace IRQ %d from %s\n",
+			printk(KERN_ERR "%s: %s can't replace IRQ %d from %s\n",
 			       __FUNCTION__, devname, irq, irq_tab[irq-64].devname);
 			return -EBUSY;
 		}
@@ -90,12 +90,12 @@
 void mvme16x_free_irq(unsigned int irq, void *dev_id)
 {
 	if (irq < 64 || irq > 255) {
-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+		printk(KERN_ERR "%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
 		return;
 	}
 
 	if (irq_tab[irq-64].dev_id != dev_id)
-		printk("%s: Removing probably wrong IRQ %d from %s\n",
+		printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
 		       __FUNCTION__, irq, irq_tab[irq-64].devname);
 
 	irq_tab[irq-64].handler = mvme16x_defhand;;
@@ -107,7 +107,7 @@
 irqreturn_t mvme16x_process_int (unsigned long vec, struct pt_regs *fp)
 {
 	if (vec < 64 || vec > 255) {
-		printk ("mvme16x_process_int: Illegal vector %ld", vec);
+		printk (KERN_ERR "mvme16x_process_int: Illegal vector %ld", vec);
 		return IRQ_NONE;
 	} else {
 		irq_tab[vec-64].count++;
@@ -132,7 +132,7 @@
 
 static irqreturn_t mvme16x_defhand (int irq, void *dev_id, struct pt_regs *fp)
 {
-	printk ("Unknown interrupt 0x%02x\n", irq);
+	printk (KERN_ERR "Unknown interrupt 0x%02x\n", irq);
 	return IRQ_NONE;
 }
 
diff -urN linux-2.6.0-test1/arch/m68k/q40/config.c linux-2.6.0-test1-printk-m68k/arch/m68k/q40/config.c
--- linux-2.6.0-test1/arch/m68k/q40/config.c	2003-07-13 23:34:30.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/q40/config.c	2003-07-23 17:00:00.000000000 -0400
@@ -126,7 +126,7 @@
 void q40_reset()
 {
         halted=1;
-        printk ("\n\n*******************************************\n"
+        printk (KERN_ALERT "\n\n*******************************************\n"
 		"Called q40_reset : press the RESET button!! \n"
 		"*******************************************\n");
 	Q40_LED_ON();
@@ -135,7 +135,7 @@
 void q40_halt()
 {
         halted=1;
-        printk ("\n\n*******************\n"
+        printk (KERN_ALERT "\n\n*******************\n"
 		    "  Called q40_halt\n"
 		    "*******************\n");
 	Q40_LED_ON();
@@ -211,7 +211,7 @@
     /* useful for early debugging stages - writes kernel messages into SRAM */
     if (!strncmp( m68k_debug_device,"mem",3 ))
       {
-	/*printk("using NVRAM debug, q40_mem_cptr=%p\n",q40_mem_cptr);*/
+	/*printk(KERN_DEBUG "using NVRAM debug, q40_mem_cptr=%p\n",q40_mem_cptr);*/
 	_cpleft=2000-((long)q40_mem_cptr-0xff020000)/4;
 	q40_console_driver.write = q40_mem_console_write;
 	register_console(&q40_console_driver);
diff -urN linux-2.6.0-test1/arch/m68k/q40/q40ints.c linux-2.6.0-test1-printk-m68k/arch/m68k/q40/q40ints.c
--- linux-2.6.0-test1/arch/m68k/q40/q40ints.c	2003-07-13 23:37:32.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/q40/q40ints.c	2003-07-23 17:03:50.000000000 -0400
@@ -109,10 +109,10 @@
 		irqreturn_t (*handler)(int, void *, struct pt_regs *),
                 unsigned long flags, const char *devname, void *dev_id)
 {
-  /*printk("q40_request_irq %d, %s\n",irq,devname);*/
+  /*printk(KERN_DEBUG "q40_request_irq %d, %s\n",irq,devname);*/
 
 	if (irq > Q40_IRQ_MAX || (irq>15 && irq<32)) {
-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
+		printk(KERN_ERR "%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
 		return -ENXIO;
 	}
 
@@ -121,10 +121,10 @@
 	  {
 	  case 1: case 2: case 8: case 9:
 	  case 12: case 13:
-	    printk("%s: ISA IRQ %d from %s not implemented by HW\n", __FUNCTION__, irq, devname);
+	    printk(KERN_ERR "%s: ISA IRQ %d from %s not implemented by HW\n", __FUNCTION__, irq, devname);
 	    return -ENXIO;
 	  case 11: 	      
-	    printk("warning IRQ 10 and 11 not distinguishable\n");
+	    printk(KERN_WARNING "warning IRQ 10 and 11 not distinguishable\n");
 	    irq=10;
 	  default:
 	    ;
@@ -134,14 +134,14 @@
 	  {
 	    if (irq_tab[irq].dev_id != NULL) 
 		  {
-		    printk("%s: IRQ %d from %s is not replaceable\n",
+		    printk(KERN_ERR "%s: IRQ %d from %s is not replaceable\n",
 			   __FUNCTION__, irq, irq_tab[irq].devname);
 		    return -EBUSY;
 		  }
-	    /*printk("IRQ %d set to handler %p\n",irq,handler);*/
+	    /*printk(KERN_DEBUG "IRQ %d set to handler %p\n",irq,handler);*/
 	    if (dev_id==NULL)
 		  {
-		printk("WARNING: dev_id == NULL in request_irq\n");
+		printk(KERN_WARNING "WARNING: dev_id == NULL in request_irq\n");
 		dev_id=(void*)1;
 	      }
 	    irq_tab[irq].handler = handler;
@@ -162,7 +162,7 @@
 void q40_free_irq(unsigned int irq, void *dev_id)
 {
 	if (irq > Q40_IRQ_MAX || (irq>15 && irq<32)) {
-		printk("%s: Incorrect IRQ %d, dev_id %x \n", __FUNCTION__, irq, (unsigned)dev_id);
+		printk(KERN_ERR "%s: Incorrect IRQ %d, dev_id %x \n", __FUNCTION__, irq, (unsigned)dev_id);
 		return;
 	}
 
@@ -171,7 +171,7 @@
 	  {
 	  case 1: case 2: case 8: case 9:
 	  case 12: case 13:
-	    printk("%s: ISA IRQ %d from %x illegal\n", __FUNCTION__, irq, (unsigned)dev_id);
+	    printk(KERN_ERR "%s: ISA IRQ %d from %x illegal\n", __FUNCTION__, irq, (unsigned)dev_id);
 	    return;
 	  case 11: irq=10;
 	  default:
@@ -181,7 +181,7 @@
 	if (irq<Q40_IRQ_SAMPLE)
 	  {
 	    if (irq_tab[irq].dev_id != dev_id)
-	      printk("%s: Removing probably wrong IRQ %d from %s\n",
+	      printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
 		     __FUNCTION__, irq, irq_tab[irq].devname);
 	    
 	    irq_tab[irq].handler = q40_defhand;
@@ -200,7 +200,7 @@
 
 irqreturn_t q40_process_int (int level, struct pt_regs *fp)
 {
-  printk("unexpected interrupt %x\n",level);
+  printk(KERN_WARNING "unexpected interrupt %x\n",level);
   return IRQ_HANDLED;
 }
 
@@ -341,7 +341,7 @@
 				  goto iirq;
 			  }
 			  if (irq_tab[irq].handler == q40_defhand ) {
-				  printk("handler for IRQ %d not defined\n",irq);
+				  printk(KERN_WARNING "handler for IRQ %d not defined\n",irq);
 				  continue; /* ignore uninited INTs :-( */
 			  }
 			  if ( irq_tab[irq].state & IRQ_INPROGRESS ) {
@@ -353,7 +353,7 @@
 				  disable_irq(irq);
 				  disabled=1;
 #else
-				  /*printk("IRQ_INPROGRESS detected for irq %d, disabling - %s disabled\n",irq,disabled ? "already" : "not yet"); */
+				  /*printk(KERN_DEBUG "IRQ_INPROGRESS detected for irq %d, disabling - %s disabled\n",irq,disabled ? "already" : "not yet"); */
 				  fp->sr = (((fp->sr) & (~0x700))+0x200);
 				  disabled=1;
 #endif
@@ -375,7 +375,7 @@
 					  enable_irq(irq);}
 #else
 				  disabled=0;
-				  /*printk("reenabling irq %d\n",irq); */
+				  /*printk(KERN_DEBUG "reenabling irq %d\n",irq); */
 #endif
 			  }
 // used to do 'goto repeat;' her, this delayed bh processing too long
@@ -383,7 +383,7 @@
 		  }
 	  }
 	  if (mer && ccleirq>0 && !aliased_irq) 
-		  printk("ISA interrupt from unknown source? EIRQ_REG = %x\n",mer),ccleirq--;
+		  printk(KERN_WARNING "ISA interrupt from unknown source? EIRQ_REG = %x\n",mer),ccleirq--;
   } 
  iirq:
   mir=master_inb(IIRQ_REG);
@@ -413,12 +413,12 @@
 
 static irqreturn_t q40_defhand (int irq, void *dev_id, struct pt_regs *fp)
 {
-	printk ("Unknown q40 interrupt 0x%02x\n", irq);
+	printk (KERN_WARNING "Unknown q40 interrupt 0x%02x\n", irq);
 	return IRQ_NONE;
 }
 static irqreturn_t sys_default_handler(int lev, void *dev_id, struct pt_regs *regs)
 {
-	printk ("Uninitialised interrupt level %d\n", lev);
+	printk (KERN_WARNING "Uninitialised interrupt level %d\n", lev);
 	return IRQ_NONE;
 }
 
@@ -434,7 +434,7 @@
   {
     mext_disabled--;
     if (mext_disabled>0)
-	  printk("q40_enable_irq : nested disable/enable\n"); 
+	  printk(KERN_NOTICE "q40_enable_irq : nested disable/enable\n"); 
     if (mext_disabled==0)
     master_outb(1,EXT_ENABLE_REG);
     }
@@ -451,13 +451,13 @@
   if ( irq>=5 && irq<=15 ) {
     master_outb(0,EXT_ENABLE_REG);
     mext_disabled++;
-    if (mext_disabled>1) printk("disable_irq nesting count %d\n",mext_disabled);
+    if (mext_disabled>1) printk(KERN_NOTICE "disable_irq nesting count %d\n",mext_disabled);
   }
 }
 
 unsigned long q40_probe_irq_on (void)
 {
-  printk("irq probing not working - reconfigure the driver to avoid this\n");
+  printk(KERN_ERR "irq probing not working - reconfigure the driver to avoid this\n");
   return -1;
 }
 int q40_probe_irq_off (unsigned long irqs)
diff -urN linux-2.6.0-test1/arch/m68k/sun3/config.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/config.c
--- linux-2.6.0-test1/arch/m68k/sun3/config.c	2003-07-13 23:35:56.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/config.c	2003-07-23 16:55:48.000000000 -0400
@@ -140,7 +140,7 @@
 {
 	unsigned long memory_start, memory_end;
 
-	printk("ARCH: SUN3\n");
+	printk(KERN_INFO "ARCH: SUN3\n");
 	idprom_init();
 
 	/* Subtract kernel memory from available memory */
diff -urN linux-2.6.0-test1/arch/m68k/sun3/idprom.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/idprom.c
--- linux-2.6.0-test1/arch/m68k/sun3/idprom.c	2003-07-13 23:32:42.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/idprom.c	2003-07-23 16:53:55.000000000 -0400
@@ -61,12 +61,12 @@
 	for (i = 0; i < NUM_SUN_MACHINES; i++) {
 		if(Sun_Machines[i].id_machtype == machtype) {
 			if (machtype != (SM_SUN4M_OBP | 0x00))
-				printk("TYPE: %s\n", Sun_Machines[i].name);
+				printk(KERN_INFO "TYPE: %s\n", Sun_Machines[i].name);
 			else {
 #if 0
 				prom_getproperty(prom_root_node, "banner-name",
 						 sysname, sizeof(sysname));
-				printk("TYPE: %s\n", sysname);
+				printk(KERN_INFO "TYPE: %s\n", sysname);
 #endif				
 			}
 			return;
@@ -122,7 +122,7 @@
 
 	display_system_type(idprom->id_machtype);
 
-	printk("Ethernet address: %x:%x:%x:%x:%x:%x\n",
+	printk(KERN_INFO "Ethernet address: %x:%x:%x:%x:%x:%x\n",
 		    idprom->id_ethaddr[0], idprom->id_ethaddr[1],
 		    idprom->id_ethaddr[2], idprom->id_ethaddr[3],
 		    idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
diff -urN linux-2.6.0-test1/arch/m68k/sun3/mmu_emu.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/mmu_emu.c
--- linux-2.6.0-test1/arch/m68k/sun3/mmu_emu.c	2003-07-13 23:35:51.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/mmu_emu.c	2003-07-23 16:55:31.000000000 -0400
@@ -68,21 +68,21 @@
 #if 0
 	/* Verbose version. */
 	unsigned long val = pte_val (pte);
-	printk (" pte=%lx [addr=%lx",
+	printk (KERN_DEBUG " pte=%lx [addr=%lx",
 		val, (val & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT);
-	if (val & SUN3_PAGE_VALID)	printk (" valid");
-	if (val & SUN3_PAGE_WRITEABLE)	printk (" write");
-	if (val & SUN3_PAGE_SYSTEM)	printk (" sys");
-	if (val & SUN3_PAGE_NOCACHE)	printk (" nocache");
-	if (val & SUN3_PAGE_ACCESSED)	printk (" accessed");
-	if (val & SUN3_PAGE_MODIFIED)	printk (" modified");
+	if (val & SUN3_PAGE_VALID)	printk (KERN_DEBUG " valid");
+	if (val & SUN3_PAGE_WRITEABLE)	printk (KERN_DEBUG " write");
+	if (val & SUN3_PAGE_SYSTEM)	printk (KERN_DEBUG " sys");
+	if (val & SUN3_PAGE_NOCACHE)	printk (KERN_DEBUG " nocache");
+	if (val & SUN3_PAGE_ACCESSED)	printk (KERN_DEBUG " accessed");
+	if (val & SUN3_PAGE_MODIFIED)	printk (KERN_DEBUG " modified");
 	switch (val & SUN3_PAGE_TYPE_MASK) {
-		case SUN3_PAGE_TYPE_MEMORY: printk (" memory"); break;
-		case SUN3_PAGE_TYPE_IO:     printk (" io");     break;
-		case SUN3_PAGE_TYPE_VME16:  printk (" vme16");  break;
-		case SUN3_PAGE_TYPE_VME32:  printk (" vme32");  break;
+		case SUN3_PAGE_TYPE_MEMORY: printk (KERN_DEBUG " memory"); break;
+		case SUN3_PAGE_TYPE_IO:     printk (KERN_DEBUG " io");     break;
+		case SUN3_PAGE_TYPE_VME16:  printk (KERN_DEBUG " vme16");  break;
+		case SUN3_PAGE_TYPE_VME32:  printk (KERN_DEBUG " vme32");  break;
 	}
-	printk ("]\n");
+	printk (KERN_DEBUG "]\n");
 #else
 	/* Terse version. More likely to fit on a line. */
 	unsigned long val = pte_val (pte);
@@ -104,7 +104,7 @@
 		default: type = "unknown?"; break;
 	}
 
-	printk (" pte=%08lx [%07lx %s %s]\n",
+	printk (KERN_DEBUG " pte=%08lx [%07lx %s %s]\n",
 		val, (val & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT, flags, type);
 #endif
 }
@@ -112,7 +112,7 @@
 /* Print the PTE value for a given virtual address. For debugging. */
 void print_pte_vaddr (unsigned long vaddr)
 {
-	printk (" vaddr=%lx [%02lx]", vaddr, sun3_get_segmap (vaddr));
+	printk (KERN_DEBUG " vaddr=%lx [%02lx]", vaddr, sun3_get_segmap (vaddr));
 	print_pte (__pte (sun3_get_pte (vaddr)));
 }
 
@@ -149,7 +149,7 @@
 		
 		if(!pmeg_alloc[i]) {
 #ifdef DEBUG_MMU_EMU
-			printk("freed: ");
+			printk(KERN_DEBUG "freed: ");
 			print_pte_vaddr (seg);
 #endif
 			sun3_put_segmap(seg, SUN3_INVALID_PMEG);
@@ -161,7 +161,7 @@
 		if (sun3_get_segmap (seg) != SUN3_INVALID_PMEG) {
 #ifdef DEBUG_PROM_MAPS
 			for(i = 0; i < 16; i++) {
-				printk ("mapped:");
+				printk (KERN_DEBUG "mapped:");
 				print_pte_vaddr (seg + (i*PAGE_SIZE));
 				break;
 			}
@@ -289,7 +289,7 @@
 
 
 #ifdef DEBUG_MMU_EMU
-printk("mmu_emu_map_pmeg: pmeg %x to context %d vaddr %x\n",
+printk(KERN_DEBUG "mmu_emu_map_pmeg: pmeg %x to context %d vaddr %x\n",
        curr_pmeg, context, vaddr);
 #endif
 
@@ -366,7 +366,7 @@
 	}
 
 #ifdef DEBUG_MMU_EMU
-	printk ("mmu_emu_handle_fault: vaddr=%lx type=%s crp=%p\n",
+	printk (KERN_DEBUG "mmu_emu_handle_fault: vaddr=%lx type=%s crp=%p\n",
 		vaddr, read_flag ? "read" : "write", crp);
 #endif
 
@@ -374,14 +374,14 @@
 	offset  = (vaddr >> SUN3_PTE_SIZE_BITS) & 0xF;
 
 #ifdef DEBUG_MMU_EMU
-	printk ("mmu_emu_handle_fault: segment=%lx offset=%lx\n", segment, offset);
+	printk (KERN_DEBUG "mmu_emu_handle_fault: segment=%lx offset=%lx\n", segment, offset);
 #endif
 
 	pte = (pte_t *) pgd_val (*(crp + segment));
 
 //todo: next line should check for valid pmd properly.
 	if (!pte) {
-//                printk ("mmu_emu_handle_fault: invalid pmd\n");
+//                printk (KERN_DEBUG "mmu_emu_handle_fault: invalid pmd\n");
                 return 0;
         }
 
@@ -413,9 +413,9 @@
 		pte_val (*pte) |= SUN3_PAGE_ACCESSED;
 
 #ifdef DEBUG_MMU_EMU
-	printk ("seg:%d crp:%p ->", get_fs().seg, crp);
+	printk (KERN_DEBUG "seg:%d crp:%p ->", get_fs().seg, crp);
 	print_pte_vaddr (vaddr);
-	printk ("\n");
+	printk (KERN_DEBUG "\n");
 #endif
 
 	return 1;
diff -urN linux-2.6.0-test1/arch/m68k/sun3/prom/init.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/prom/init.c
--- linux-2.6.0-test1/arch/m68k/sun3/prom/init.c	2003-07-13 23:37:57.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/prom/init.c	2003-07-23 16:52:28.000000000 -0400
@@ -81,7 +81,7 @@
 
 	prom_ranges_init();
 #endif
-//	printk("PROMLIB: Sun Boot Prom Version %d Revision %d\n",
+//	printk(KERN_INFO "PROMLIB: Sun Boot Prom Version %d Revision %d\n",
 //	       romvec->pv_romvers, prom_rev);
 
 	/* Initialization successful. */
diff -urN linux-2.6.0-test1/arch/m68k/sun3/prom/printf.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/prom/printf.c
--- linux-2.6.0-test1/arch/m68k/sun3/prom/printf.c	2003-07-13 23:29:29.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/prom/printf.c	2003-07-23 16:52:16.000000000 -0400
@@ -44,7 +44,7 @@
 
 #ifdef CONFIG_KGDB
 	if (kgdb_initialized) {
-		printk("kgdb_initialized = %d\n", kgdb_initialized);
+		printk(KERN_INFO "kgdb_initialized = %d\n", kgdb_initialized);
 		putpacket(bptr, 1);
 	} else
 #else
diff -urN linux-2.6.0-test1/arch/m68k/sun3/sun3dvma.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/sun3dvma.c
--- linux-2.6.0-test1/arch/m68k/sun3/sun3dvma.c	2003-07-13 23:36:42.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/sun3dvma.c	2003-07-23 16:57:32.000000000 -0400
@@ -58,7 +58,7 @@
 	int i;
 	int j = 0;
 
-	printk("dvma entry usage:\n");
+	printk(KERN_NOTICE "dvma entry usage:\n");
 	
 	for(i = 0; i < IOMMU_TOTAL_ENTRIES; i++) {
 		if(!iommu_use[i])
@@ -66,15 +66,15 @@
 		
 		j++;
 
-		printk("dvma entry: %08lx len %08lx\n", 
+		printk(KERN_NOTICE "dvma entry: %08lx len %08lx\n", 
 		       ( i << DVMA_PAGE_SHIFT) + DVMA_START,
 		       iommu_use[i]);
 	}
 
-	printk("%d entries in use total\n", j);
+	printk(KERN_NOTICE "%d entries in use total\n", j);
 
-	printk("allocation/free calls: %lu/%lu\n", dvma_allocs, dvma_frees);
-	printk("allocation/free bytes: %Lx/%Lx\n", dvma_alloc_bytes, 
+	printk(KERN_NOTICE "allocation/free calls: %lu/%lu\n", dvma_allocs, dvma_frees);
+	printk(KERN_NOTICE "allocation/free bytes: %Lx/%Lx\n", dvma_alloc_bytes, 
 	       dvma_free_bytes);
 }
 
@@ -84,17 +84,17 @@
 	struct list_head *cur;
 	struct hole *hole;
 
-	printk("listing dvma holes\n");
+	printk(KERN_NOTICE "listing dvma holes\n");
 	list_for_each(cur, holes) {
 		hole = list_entry(cur, struct hole, list);
 		
 		if((hole->start == 0) && (hole->end == 0) && (hole->size == 0))
 			continue;
 		
-		printk("hole: start %08lx end %08lx size %08lx\n", hole->start, hole->end, hole->size);
+		printk(KERN_NOTICE "hole: start %08lx end %08lx size %08lx\n", hole->start, hole->end, hole->size);
 	}
 	
-	printk("end of hole listing...\n");
+	printk(KERN_NOTICE "end of hole listing...\n");
 	
 }
 #endif /* DVMA_DEBUG */
@@ -134,7 +134,7 @@
 
 	if(list_empty(&hole_cache)) {
 		if(!refill()) {
-			printk("out of dvma hole cache!\n");
+			printk(KERN_ERR "out of dvma hole cache!\n");
 			BUG();
 		}
 	}
@@ -154,7 +154,7 @@
 
 	if(list_empty(&hole_list)) {
 #ifdef DVMA_DEBUG
-		printk("out of dvma holes! (printing hole cache)\n");
+		printk(KERN_DEBUG "out of dvma holes! (printing hole cache)\n");
 		print_holes(&hole_cache);
 		print_use();
 #endif
@@ -193,7 +193,7 @@
 
 	}
 
-	printk("unable to find dvma hole!\n");
+	printk(KERN_ERR "unable to find dvma hole!\n");
 	BUG();
 	return 0;
 }
@@ -285,13 +285,13 @@
 		len = 0x800;
 
 	if(!kaddr || !len) {
-//		printk("error: kaddr %lx len %x\n", kaddr, len);
+//		printk(KERN_ERR "error: kaddr %lx len %x\n", kaddr, len);
 //		*(int *)4 = 0;
 		return 0;
 	}
 
 #ifdef DEBUG
-	printk("dvma_map request %08lx bytes from %08lx\n", 
+	printk(KERN_DEBUG "dvma_map request %08lx bytes from %08lx\n", 
 	       len, kaddr);
 #endif
 	off = kaddr & ~DVMA_PAGE_MASK;
@@ -305,12 +305,12 @@
 		align = ((align + (DVMA_PAGE_SIZE-1)) & DVMA_PAGE_MASK);
 
 	baddr = get_baddr(len, align);
-//	printk("using baddr %lx\n", baddr);
+//	printk(KERN_NOTICE "using baddr %lx\n", baddr);
 
 	if(!dvma_map_iommu(kaddr, baddr, len))
 		return (baddr + off);
 	
-	printk("dvma_map failed kaddr %lx baddr %lx len %x\n", kaddr, baddr, len);
+	printk(KERN_ERR "dvma_map failed kaddr %lx baddr %lx len %x\n", kaddr, baddr, len);
 	BUG();
 	return 0;
 }
@@ -341,7 +341,7 @@
 		return NULL;
 
 #ifdef DEBUG
-	printk("dvma_malloc request %lx bytes\n", len);
+	printk(KERN_DEBUG "dvma_malloc request %lx bytes\n", len);
 #endif
 	len = ((len + (DVMA_PAGE_SIZE-1)) & DVMA_PAGE_MASK);
 
@@ -362,7 +362,7 @@
 	}
 
 #ifdef DEBUG
-	printk("mapped %08lx bytes %08lx kern -> %08lx bus\n",
+	printk(KERN_DEBUG "mapped %08lx bytes %08lx kern -> %08lx bus\n",
 	       len, kaddr, baddr);
 #endif
 
diff -urN linux-2.6.0-test1/arch/m68k/sun3/sun3ints.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/sun3ints.c
--- linux-2.6.0-test1/arch/m68k/sun3/sun3ints.c	2003-07-13 23:39:30.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3/sun3ints.c	2003-07-23 16:58:10.000000000 -0400
@@ -169,7 +169,7 @@
 
 	if(irq < SYS_IRQS) {
 		if(sun3_inthandler[irq] != NULL) {
-			printk("sun3_request_irq: request for irq %d -- already taken!\n", irq);
+			printk(KERN_WARNING "sun3_request_irq: request for irq %d -- already taken!\n", irq);
 			return 1;
 		}
 		
@@ -187,7 +187,7 @@
 
 			vec = irq - 64;
 			if(sun3_vechandler[vec] != NULL) {
-				printk("sun3_request_irq: request for vec %d -- already taken!\n", irq);
+				printk(KERN_WARNING "sun3_request_irq: request for vec %d -- already taken!\n", irq);
 				return 1;
 			}
 
@@ -200,7 +200,7 @@
 		}
 	}
 
-	printk("sun3_request_irq: invalid irq %d\n", irq);
+	printk(KERN_WARNING "sun3_request_irq: invalid irq %d\n", irq);
 	return 1;
 
 }
diff -urN linux-2.6.0-test1/arch/m68k/sun3x/dvma.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3x/dvma.c
--- linux-2.6.0-test1/arch/m68k/sun3x/dvma.c	2003-07-13 23:30:48.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3x/dvma.c	2003-07-23 17:07:19.000000000 -0400
@@ -70,7 +70,7 @@
 
         index = dvma_addr >> DVMA_PAGE_SHIFT;
 
-        printk("idx %lx dvma_addr %08lx paddr %08lx\n", index, dvma_addr,
+        printk(KERN_ALERT "idx %lx dvma_addr %08lx paddr %08lx\n", index, dvma_addr,
                dvma_entry_paddr(index));
 
 
@@ -93,7 +93,7 @@
 	end = PAGE_ALIGN(vaddr + len);
 
 #ifdef DEBUG
-	printk("dvma: mapping kern %08lx to virt %08lx\n",
+	printk(KERN_DEBUG "dvma: mapping kern %08lx to virt %08lx\n",
 	       kaddr, vaddr);
 #endif
 	pgd = pgd_offset_k(vaddr);
@@ -128,7 +128,7 @@
 
 			do {
 #ifdef DEBUG
-				printk("mapping %08lx phys to %08lx\n",
+				printk(KERN_DEBUG "mapping %08lx phys to %08lx\n",
 				       __pa(kaddr), vaddr);
 #endif
 				set_pte(pte, pfn_pte(virt_to_pfn(kaddr), 
@@ -163,7 +163,7 @@
 	for(; index < end ; index++) {
 //		if(dvma_entry_use(index))
 //			BUG();
-//		printk("mapping pa %lx to ba %lx\n", __pa(kaddr), index << DVMA_PAGE_SHIFT);
+//		printk(KERN_DEBUG "mapping pa %lx to ba %lx\n", __pa(kaddr), index << DVMA_PAGE_SHIFT);
 
 		dvma_entry_set(index, __pa(kaddr));
 
@@ -192,11 +192,11 @@
 	
 	for(; index < end ; index++) {
 #ifdef DEBUG
-		printk("freeing bus mapping %08x\n", index << DVMA_PAGE_SHIFT);
+		printk(KERN_DEBUG "freeing bus mapping %08x\n", index << DVMA_PAGE_SHIFT);
 #endif
 #if 0
 		if(!dvma_entry_use(index)) 
-			printk("dvma_unmap freeing unused entry %04x\n",
+			printk(KERN_DEBUG "dvma_unmap freeing unused entry %04x\n",
 			       index);
 		else
 			dvma_entry_dec(index);
diff -urN linux-2.6.0-test1/arch/m68k/sun3x/prom.c linux-2.6.0-test1-printk-m68k/arch/m68k/sun3x/prom.c
--- linux-2.6.0-test1/arch/m68k/sun3x/prom.c	2003-07-13 23:33:47.000000000 -0400
+++ linux-2.6.0-test1-printk-m68k/arch/m68k/sun3x/prom.c	2003-07-23 17:07:43.000000000 -0400
@@ -111,9 +111,9 @@
     idprom_init();
 
     if(!((idprom->id_machtype & SM_ARCH_MASK) == SM_SUN3X)) {
-	    printk("Warning: machine reports strange type %02x\n",
+	    printk(KERN_WARNING "Warning: machine reports strange type %02x\n",
 		   idprom->id_machtype);
-	    printk("Pretending it's a 3/80, but very afraid...\n");
+	    printk(KERN_WARNING "Pretending it's a 3/80, but very afraid...\n");
 	    idprom->id_machtype = SM_SUN3X | SM_3_80;
     }
 
