summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Watson <gphat@cafes.net>2002-08-04 04:49:54 -0400
committerJeff Garzik <jgarzik@mandrakesoft.com>2002-08-04 04:49:54 -0400
commit08fc776404da15063b18fea4c2d3a16a058daedf (patch)
tree3aaf968ddc6458c374a12e9c48b53f1681d0a99a
parent36dec0f4b615f31c1b247429768f333d427a860d (diff)
Add KERN_xxx prefixes to printk's in kernel/ subdir.
-rw-r--r--kernel/dma.c4
-rw-r--r--kernel/panic.c2
-rw-r--r--kernel/resource.c2
-rw-r--r--kernel/signal.c8
-rw-r--r--kernel/timer.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/kernel/dma.c b/kernel/dma.c
index 8f8586f4235c..5cf4020f4232 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -98,12 +98,12 @@ int request_dma(unsigned int dmanr, const char * device_id)
void free_dma(unsigned int dmanr)
{
if (dmanr >= MAX_DMA_CHANNELS) {
- printk("Trying to free DMA%d\n", dmanr);
+ printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
return;
}
if (xchg(&dma_chan_busy[dmanr].lock, 0) == 0) {
- printk("Trying to free free DMA%d\n", dmanr);
+ printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
return;
}
diff --git a/kernel/panic.c b/kernel/panic.c
index 69f1f9123956..7be1f98be629 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -88,7 +88,7 @@ NORET_TYPE void panic(const char * fmt, ...)
extern int stop_a_enabled;
/* Make sure the user can actually press L1-A */
stop_a_enabled = 1;
- printk("Press L1-A to return to the boot prom\n");
+ printk(KERN_EMERG "Press L1-A to return to the boot prom\n");
}
#endif
#if defined(CONFIG_ARCH_S390)
diff --git a/kernel/resource.c b/kernel/resource.c
index bf331c1092ed..57541cc03d09 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -290,7 +290,7 @@ void __release_region(struct resource *parent, unsigned long start, unsigned lon
}
p = &res->sibling;
}
- printk("Trying to free nonexistent resource <%08lx-%08lx>\n", start, end);
+ printk(KERN_WARNING "Trying to free nonexistent resource <%08lx-%08lx>\n", start, end);
}
/*
diff --git a/kernel/signal.c b/kernel/signal.c
index dcb9beb032d4..fd9dd81c2815 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -270,7 +270,7 @@ dequeue_signal(sigset_t *mask, siginfo_t *info)
int sig = 0;
#if DEBUG_SIG
-printk("SIG dequeue (%s:%d): %d ", current->comm, current->pid,
+printk(KERN_DEBUG "SIG dequeue (%s:%d): %d ", current->comm, current->pid,
signal_pending(current));
#endif
@@ -294,7 +294,7 @@ printk("SIG dequeue (%s:%d): %d ", current->comm, current->pid,
recalc_sigpending();
#if DEBUG_SIG
-printk(" %d -> %d\n", signal_pending(current), sig);
+printk(KERN_DEBUG " %d -> %d\n", signal_pending(current), sig);
#endif
return sig;
@@ -536,7 +536,7 @@ send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
#if DEBUG_SIG
-printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig);
+printk(KERN_DEBUG "SIG queue (%s:%d): %d ", t->comm, t->pid, sig);
#endif
ret = -EINVAL;
@@ -577,7 +577,7 @@ out:
spin_unlock_irqrestore(&t->sigmask_lock, flags);
out_nolock:
#if DEBUG_SIG
-printk(" %d -> %d\n", signal_pending(t), ret);
+printk(KERN_DEBUG " %d -> %d\n", signal_pending(t), ret);
#endif
return ret;
diff --git a/kernel/timer.c b/kernel/timer.c
index 3c7cbeaf957a..d4efe5823e94 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -194,7 +194,7 @@ void add_timer(struct timer_list *timer)
return;
bug:
spin_unlock_irqrestore(&timerlist_lock, flags);
- printk("bug: kernel timer added twice at %p.\n",
+ printk(KERN_ERR "BUG: kernel timer added twice at %p.\n",
__builtin_return_address(0));
}