Commit 8834e16c authored by Linus Torvalds's avatar Linus Torvalds

Merge http://gkernel.bkbits.net/janitor-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents d7d823ed 08fc7764
...@@ -87,12 +87,12 @@ int request_dma(unsigned int dmanr, const char * device_id) ...@@ -87,12 +87,12 @@ int request_dma(unsigned int dmanr, const char * device_id)
void free_dma(unsigned int dmanr) void free_dma(unsigned int dmanr)
{ {
if (dmanr >= MAX_DMA_CHANNELS) { if (dmanr >= MAX_DMA_CHANNELS) {
printk("Trying to free DMA%d\n", dmanr); printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
return; return;
} }
if (xchg(&dma_chan_busy[dmanr].lock, 0) == 0) { 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; return;
} }
......
...@@ -88,7 +88,7 @@ NORET_TYPE void panic(const char * fmt, ...) ...@@ -88,7 +88,7 @@ NORET_TYPE void panic(const char * fmt, ...)
extern int stop_a_enabled; extern int stop_a_enabled;
/* Make sure the user can actually press L1-A */ /* Make sure the user can actually press L1-A */
stop_a_enabled = 1; 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 #endif
#if defined(CONFIG_ARCH_S390) #if defined(CONFIG_ARCH_S390)
......
...@@ -290,7 +290,7 @@ void __release_region(struct resource *parent, unsigned long start, unsigned lon ...@@ -290,7 +290,7 @@ void __release_region(struct resource *parent, unsigned long start, unsigned lon
} }
p = &res->sibling; 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);
} }
/* /*
......
...@@ -270,7 +270,7 @@ dequeue_signal(sigset_t *mask, siginfo_t *info) ...@@ -270,7 +270,7 @@ dequeue_signal(sigset_t *mask, siginfo_t *info)
int sig = 0; int sig = 0;
#if DEBUG_SIG #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)); signal_pending(current));
#endif #endif
...@@ -294,7 +294,7 @@ printk("SIG dequeue (%s:%d): %d ", current->comm, current->pid, ...@@ -294,7 +294,7 @@ printk("SIG dequeue (%s:%d): %d ", current->comm, current->pid,
recalc_sigpending(); recalc_sigpending();
#if DEBUG_SIG #if DEBUG_SIG
printk(" %d -> %d\n", signal_pending(current), sig); printk(KERN_DEBUG " %d -> %d\n", signal_pending(current), sig);
#endif #endif
return sig; return sig;
...@@ -536,7 +536,7 @@ send_sig_info(int sig, struct siginfo *info, struct task_struct *t) ...@@ -536,7 +536,7 @@ send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
#if DEBUG_SIG #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 #endif
ret = -EINVAL; ret = -EINVAL;
...@@ -577,7 +577,7 @@ printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig); ...@@ -577,7 +577,7 @@ printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig);
spin_unlock_irqrestore(&t->sigmask_lock, flags); spin_unlock_irqrestore(&t->sigmask_lock, flags);
out_nolock: out_nolock:
#if DEBUG_SIG #if DEBUG_SIG
printk(" %d -> %d\n", signal_pending(t), ret); printk(KERN_DEBUG " %d -> %d\n", signal_pending(t), ret);
#endif #endif
return ret; return ret;
......
...@@ -194,7 +194,7 @@ void add_timer(struct timer_list *timer) ...@@ -194,7 +194,7 @@ void add_timer(struct timer_list *timer)
return; return;
bug: bug:
spin_unlock_irqrestore(&timerlist_lock, flags); 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)); __builtin_return_address(0));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment