diff -Naur -X exclude-files ac_cur/arch/um/drivers/chan_kern.c ac/arch/um/drivers/chan_kern.c
--- ac_cur/arch/um/drivers/chan_kern.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/chan_kern.c Fri Jun 1 22:16:29 2001
@@ -3,6 +3,7 @@
* Licensed under the GPL
*/
+#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/tty.h>
#include <asm/irq.h>
@@ -91,7 +92,7 @@
data = chan;
break;
default:
- printk("open_chan : Unknown channel type - %d\n", chan->type);
+ printk(KERN_ERR "open_chan : Unknown channel type - %d\n", chan->type);
err = -ENODEV;
break;
}
@@ -161,7 +162,7 @@
tty_name = &str[strlen("tty")];
if(*tty_name != ':'){
- printk("parse_chan : channel type 'tty' must "
+ printk(KERN_ERR "parse_chan : channel type 'tty' must "
"specify a device\n");
return(-1);
}
@@ -185,14 +186,14 @@
sock = &str[strlen("socket")];
if(*sock != ':'){
- printk("parse_chan : channel type 'socket' must "
+ printk(KERN_ERR "parse_chan : channel type 'socket' must "
"specify a socket\n");
return(-1);
}
sock++;
n = simple_strtoul(sock, NULL, 0);
if(n == 0){
- printk("parse_chan : invalid socket number - '%s'\n",
+ printk(KERN_ERR "parse_chan : invalid socket number - '%s'\n",
sock);
return(-1);
}
@@ -204,14 +205,14 @@
fd = &str[strlen("fd")];
if(*fd != ':'){
- printk("parse_chan : channel type 'fd' must "
+ printk(KERN_ERR "parse_chan : channel type 'fd' must "
"specify a file descriptor\n");
return(-1);
}
fd++;
n = simple_strtoul(fd, &end, 0);
if(*end != '\0'){
- printk("parse_chan : couldn't parse file descriptor "
+ printk(KERN_ERR "parse_chan : couldn't parse file descriptor "
"'%s'", fd);
return(-1);
}
@@ -219,7 +220,7 @@
return(0);
}
else {
- printk("parse_chan couldn't parse \"%s\"\n", str);
+ printk(KERN_ERR "parse_chan couldn't parse \"%s\"\n", str);
return(-1);
}
chan->init_pri = pri;
diff -Naur -X exclude-files ac_cur/arch/um/drivers/chan_user.c ac/arch/um/drivers/chan_user.c
--- ac_cur/arch/um/drivers/chan_user.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/chan_user.c Fri Jun 1 22:16:36 2001
@@ -218,8 +218,7 @@
char *name;
if((info.fd = accept(chan->fd, NULL, 0)) < 0){
- printk("tty_read: accept failed - errno = %d\n",
- errno);
+ printk("tty_read: accept failed - errno = %d\n", errno);
return;
}
mkdir("/tmp/uml_dev", 0777);
diff -Naur -X exclude-files ac_cur/arch/um/drivers/daemon_user.c ac/arch/um/drivers/daemon_user.c
--- ac_cur/arch/um/drivers/daemon_user.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/daemon_user.c Fri Jun 1 22:16:40 2001
@@ -97,7 +97,7 @@
}
if(connect(pri->control, ctl_addr, sizeof(*ctl_addr)) < 0){
- printk("daemon_open : control connect failed, errno = %d\n",
+ printk("daemon_open : control connect failed, errno = %d\n",
errno);
err = -ENOTCONN;
goto out;
diff -Naur -X exclude-files ac_cur/arch/um/drivers/ethertap_kern.c ac/arch/um/drivers/ethertap_kern.c
--- ac_cur/arch/um/drivers/ethertap_kern.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/ethertap_kern.c Fri Jun 1 22:16:45 2001
@@ -51,7 +51,8 @@
memcpy(epri->hw_addr, ethertap_priv[index].hw_addr,
sizeof(epri->hw_addr));
printk("TAP backend - %s", epri->dev_name);
- if(epri->gate_addr != NULL) printk(", IP = %s", epri->gate_addr);
+ if(epri->gate_addr != NULL)
+ printk(", IP = %s", epri->gate_addr);
epri->hw_setup = ethertap_priv[index].hw_setup;
if(epri->hw_setup)
printk(", ether = %x:%x:%x:%x:%x:%x",
@@ -122,7 +123,8 @@
dev->private_size = sizeof(struct ethertap_data);
dev->transport_index = ethertap_count++;
if(*str != ','){
- printk("ethertap_setup: expected ',' after 'ethertap'\n");
+ printk(KERN_ERR
+ "ethertap_setup: expected ',' after 'ethertap'\n");
return;
}
str++;
diff -Naur -X exclude-files ac_cur/arch/um/drivers/net_kern.c ac/arch/um/drivers/net_kern.c
--- ac_cur/arch/um/drivers/net_kern.c Fri Jun 1 20:57:34 2001
+++ ac/arch/um/drivers/net_kern.c Fri Jun 1 22:16:53 2001
@@ -6,6 +6,7 @@
*/
#include "linux/config.h"
+#include "linux/kernel.h"
#include "linux/netdevice.h"
#include "linux/skbuff.h"
#include "linux/socket.h"
@@ -41,16 +42,17 @@
n = simple_strtoul(str, &end, 0);
if(end == str){
- printk("eth_setup: Failed to parse '%s'\n", str);
+ printk(KERN_ERR "eth_setup: Failed to parse '%s'\n", str);
return(1);
}
if((n < 0) || (n > sizeof(devices)/sizeof(devices[0]))){
- printk("eth_setup: device %d out of range\n", n);
+ printk(KERN_ERR "eth_setup: device %d out of range\n", n);
return(1);
}
str = end;
if(*str != '='){
- printk("eth_setup: expected '=' after device number\n");
+ printk(KERN_ERR
+ "eth_setup: expected '=' after device number\n");
return(1);
}
str++;
@@ -115,7 +117,8 @@
spin_lock(&lp->lock);
while((err = uml_net_rx(dev)) > 0) ;
if(err < 0) {
- printk("Device '%s' read returned %d, shutting it "
+ printk(KERN_ERR
+ "Device '%s' read returned %d, shutting it "
"down\n", dev->name, err);
dev->flags &= ~IFF_UP;
dev_close(dev);
@@ -145,7 +148,7 @@
err = um_request_irq(dev->irq, lp->fd, uml_net_interrupt,
SA_INTERRUPT | SA_SHIRQ, dev->name, dev);
if(err != 0){
- printk("uml_net_open: failed to get irq(%d)\n", err);
+ printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
(*lp->close)(lp->fd, &lp->user);
lp->fd = -1;
err = -ENETUNREACH;
@@ -205,7 +208,7 @@
}
else {
netif_start_queue(dev);
- printk("uml_net_start_xmit: failed(%d)\n", len);
+ printk(KERN_ERR "uml_net_start_xmit: failed(%d)\n", len);
}
spin_unlock_irqrestore(&lp->lock, flags);
@@ -279,7 +282,7 @@
#ifdef undef
struct connection *conn = (struct connection *)_conn;
- dprintk("uml_net_user_timer_expire [%p]\n", conn);
+ dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
do_connect(conn);
#endif
}
@@ -294,7 +297,7 @@
if(devices[i].user == NULL) continue;
devices[i].private_size += sizeof(struct uml_net_private) +
sizeof(((struct uml_net_private *) 0)->user);
- printk("Netdevice %d : ", i);
+ printk(KERN_INFO "Netdevice %d : ", i);
dev = (*devices[i].kern->init)(devices[i].private_size,
devices[i].transport_index);
@@ -357,7 +360,8 @@
addr[i] = simple_strtoul(str, &end, 16);
if((end == str) ||
((*end != ':') && (*end != ',') && (*end != '\0'))){
- printk("setup_etheraddr: failed to parse '%s' "
+ printk(KERN_ERR
+ "setup_etheraddr: failed to parse '%s' "
"as an ethernet address\n", str);
return(-1);
}
diff -Naur -X exclude-files ac_cur/arch/um/drivers/slip_kern.c ac/arch/um/drivers/slip_kern.c
--- ac_cur/arch/um/drivers/slip_kern.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/slip_kern.c Fri Jun 1 22:16:58 2001
@@ -1,3 +1,4 @@
+#include "linux/kernel.h"
#include "linux/stddef.h"
#include "linux/init.h"
#include "linux/netdevice.h"
@@ -39,7 +40,7 @@
umn_dev.tx_queue_len = 256;
umn_dev.flags = IFF_NOARP;
if(register_netdev(&umn_dev))
- printk("Couldn't initialize umn\n");
+ printk(KERN_ERR "Couldn't initialize umn\n");
printk("SLIP backend - SLIP IP = %s\n", spri->gate_addr);
return(&umn_dev);
diff -Naur -X exclude-files ac_cur/arch/um/drivers/ssl.c ac/arch/um/drivers/ssl.c
--- ac_cur/arch/um/drivers/ssl.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/ssl.c Fri Jun 1 22:17:02 2001
@@ -52,7 +52,8 @@
void ssl_announce(char *dev_name, int dev)
{
- printk("Serial line %d assigned device '%s'\n", dev, dev_name);
+ printk(KERN_INFO "Serial line %d assigned device '%s'\n", dev,
+ dev_name);
}
DECLARE_MUTEX(ssl_sem);
@@ -72,8 +73,8 @@
&private[line]);
up(&ssl_sem);
if(err){
- printk("Couldn't open serial line %d - errno = %d\n", line,
- -err);
+ printk(KERN_ERR "Couldn't open serial line %d - errno = %d\n",
+ line, -err);
up(&ssl_sem);
return(err);
}
@@ -148,7 +149,8 @@
ret = -ENOIOCTLCMD;
break;
default:
- printk("Unimplemented ioctl in ssl_ioctl : 0x%x\n", cmd);
+ printk(KERN_ERR
+ "Unimplemented ioctl in ssl_ioctl : 0x%x\n", cmd);
ret = -ENOIOCTLCMD;
break;
}
@@ -157,12 +159,12 @@
static void ssl_throttle(struct tty_struct * tty)
{
- printk("Someone should implement ssl_throttle\n");
+ printk(KERN_ERR "Someone should implement ssl_throttle\n");
}
static void ssl_unthrottle(struct tty_struct * tty)
{
- printk("Someone should implement ssl_unthrottle\n");
+ printk(KERN_ERR "Someone should implement ssl_unthrottle\n");
}
static void ssl_set_termios(struct tty_struct *tty,
@@ -172,12 +174,12 @@
static void ssl_stop(struct tty_struct *tty)
{
- printk("Someone should implement ssl_stop\n");
+ printk(KERN_ERR "Someone should implement ssl_stop\n");
}
static void ssl_start(struct tty_struct *tty)
{
- printk("Someone should implement ssl_start\n");
+ printk(KERN_ERR "Someone should implement ssl_start\n");
}
void ssl_hangup(struct tty_struct *tty)
@@ -260,7 +262,8 @@
else {
n = simple_strtoul(str, &end, 0);
if(*end != '='){
- printk("ssl_chan_setup failed to parse \"%s\"\n",
+ printk(KERN_ERR
+ "ssl_chan_setup failed to parse \"%s\"\n",
str);
return(1);
}
diff -Naur -X exclude-files ac_cur/arch/um/drivers/stdio_console.c ac/arch/um/drivers/stdio_console.c
--- ac_cur/arch/um/drivers/stdio_console.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/stdio_console.c Fri Jun 1 22:17:06 2001
@@ -61,7 +61,8 @@
down(&stdio_sem);
err = open_chan_pair(&vts[line].chan, setup_console_irq, &vts[line]);
if(err < 0){
- printk("Failed to open virtual console %d, errno = %d\n",
+ printk(KERN_ERR
+ "Failed to open virtual console %d, errno = %d\n",
line, err);
up(&stdio_sem);
return(err);
@@ -218,7 +219,8 @@
void stdio_announce(char *dev_name, int dev)
{
- printk("Virtual console %d assigned device '%s'\n", dev, dev_name);
+ printk(KERN_INFO "Virtual console %d assigned device '%s'\n", dev,
+ dev_name);
}
static struct chan_opts opts = {
@@ -237,7 +239,8 @@
else {
n = simple_strtoul(str, &end, 0);
if(*end != '='){
- printk("console_chan_setup failed to parse \"%s\"\n",
+ printk(KERN_ERR
+ "console_chan_setup failed to parse \"%s\"\n",
str);
return(1);
}
diff -Naur -X exclude-files ac_cur/arch/um/drivers/ubd.c ac/arch/um/drivers/ubd.c
--- ac_cur/arch/um/drivers/ubd.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/ubd.c Fri Jun 1 22:17:10 2001
@@ -164,21 +164,23 @@
}
major = simple_strtoul(str, &end, 0);
if(*end != '\0'){
- printk("ubd_setup : didn't parse major number\n");
+ printk(KERN_ERR
+ "ubd_setup : didn't parse major number\n");
return(1);
}
fake_gendisk.major = major;
fake_major = major;
- printk("Setting extra ubd major number to %d\n", major);
+ printk(KERN_INFO "Setting extra ubd major number to %d\n",
+ major);
return(1);
}
if(n < '0'){
- printk("ubd_setup : index out of range\n");
+ printk(KERN_ERR "ubd_setup : index out of range\n");
return(1);
}
n -= '0';
if(n >= MAX_DEV){
- printk("ubd_setup : index out of range\n");
+ printk(KERN_ERR "ubd_setup : index out of range\n");
return(1);
}
sync = ubd_dev[n].boot_openflags & O_SYNC;
@@ -191,7 +193,7 @@
str++;
}
if(*str++ != '='){
- printk("ubd_setup : Expected '='\n");
+ printk(KERN_ERR "ubd_setup : Expected '='\n");
return(1);
}
ubd_dev[n].file = str;
@@ -203,7 +205,8 @@
static int fakehd(char *str)
{
- printk("fakehd : Changing ubd_gendisk.major_name to \"hd\".\n");
+ printk(KERN_INFO
+ "fakehd : Changing ubd_gendisk.major_name to \"hd\".\n");
ubd_gendisk.major_name = "hd";
return(1);
}
@@ -242,7 +245,7 @@
DEVICE_INTR = NULL;
intr_count++;
if(read_ubd_fs(thread_fds[0], &req, sizeof(req)) != sizeof(req)){
- printk("Pid %d - spurious interrupt in ubd_handler, "
+ printk(KERN_ERR "Pid %d - spurious interrupt in ubd_handler, "
"errno = %d\n", getpid(), errno);
return;
}
@@ -280,7 +283,7 @@
devfs_handle = devfs_mk_dir (NULL, "ubd", NULL);
if (devfs_register_blkdev(MAJOR_NR, "ubd", &ubd_blops)) {
- printk("ubd: unable to get major %d\n", MAJOR_NR);
+ printk(KERN_ERR "ubd: unable to get major %d\n", MAJOR_NR);
return -1;
}
q = BLK_DEFAULT_QUEUE(MAJOR_NR);
@@ -293,7 +296,8 @@
gendisk_head = &ubd_gendisk;
if (fake_major != 0){
if(devfs_register_blkdev(fake_major, "ubd", &ubd_blops)) {
- printk("ubd: unable to get major %d\n", fake_major);
+ printk(KERN_ERR "ubd: unable to get major %d\n",
+ fake_major);
return -1;
}
blk_init_queue(BLK_DEFAULT_QUEUE(fake_major), DEVICE_REQUEST);
@@ -331,20 +335,22 @@
make_ide_entries(dev_name);
}
if(sync){
- printk("ubd : Synchronous mode\n");
+ printk(KERN_INFO "ubd : Synchronous mode\n");
return(0);
}
stack = alloc_stack();
io_pid = start_io_thread(stack + PAGE_SIZE - sizeof(void *),
thread_fds);
if(io_pid < 0){
- printk("ubd : Failed to start I/O thread (errno = %d) - "
+ printk(KERN_ERR
+ "ubd : Failed to start I/O thread (errno = %d) - "
"falling back to synchronous I/O\n", -io_pid);
return(0);
}
err = um_request_irq(UBD_IRQ, thread_fds[0], ubd_intr, SA_INTERRUPT,
"ubd", ubd_dev);
- if(err != 0) printk("um_request_irq failed - errno = %d\n", -err);
+ if(err != 0) printk(KERN_ERR
+ "um_request_irq failed - errno = %d\n", -err);
return(err);
}
@@ -365,7 +371,8 @@
if(ubd_dev[n].count == 0){
if((ubd_dev[n].fd = open_ubd_fs(ubd_dev[n].file,
&ubd_dev[n].openflags)) < 0){
- printk("ubd%d: Can't open \"%s\": errno = %d\n", n,
+ printk(KERN_ERR
+ "ubd%d: Can't open \"%s\": errno = %d\n", n,
ubd_dev[n].file, -ubd_dev[n].fd);
}
}
diff -Naur -X exclude-files ac_cur/arch/um/drivers/ubd_user.c ac/arch/um/drivers/ubd_user.c
--- ac_cur/arch/um/drivers/ubd_user.c Fri Jun 1 20:50:46 2001
+++ ac/arch/um/drivers/ubd_user.c Fri Jun 1 22:17:13 2001
@@ -109,7 +109,7 @@
if((kernel_fds[0] = get_pty()) < 0) return(-1);
raw(kernel_fds[0], 1);
if((fds_out[0] = open(ptsname(kernel_fds[0]), O_RDWR)) < 0){
- printk("Couldn't open tty for slip line\n");
+ printk("Couldn't open tty for IO\n");
return(-1);
}
fds_out[1] = fds_out[0];
diff -Naur -X exclude-files ac_cur/arch/um/kernel/exec_kern.c ac/arch/um/kernel/exec_kern.c
--- ac_cur/arch/um/kernel/exec_kern.c Fri Jun 1 20:50:47 2001
+++ ac/arch/um/kernel/exec_kern.c Fri Jun 1 22:17:17 2001
@@ -61,7 +61,12 @@
stack = alloc_stack();
new_pid = start_fork_tramp(current->thread.kernel_stack,
stack, 0, exec_tramp);
- if(new_pid < 0) do_exit(SIGKILL);
+ if(new_pid < 0){
+ printk(KERN_ERR
+ "flush_thread : new thread failed, errno = %d\n",
+ errno);
+ do_exit(SIGKILL);
+ }
forward_interrupts(new_pid);
current->thread.request.op = OP_EXEC;
current->thread.request.u.exec.pid = new_pid;
diff -Naur -X exclude-files ac_cur/arch/um/kernel/irq.c ac/arch/um/kernel/irq.c
--- ac_cur/arch/um/kernel/irq.c Fri Jun 1 20:50:47 2001
+++ ac/arch/um/kernel/irq.c Fri Jun 1 22:17:21 2001
@@ -46,7 +46,7 @@
* a generic callback i think.
*/
#if CONFIG_X86
- printk("unexpected IRQ trap at vector %02x\n", irq);
+ printk(KERN_ERR "unexpected IRQ trap at vector %02x\n", irq);
#ifdef CONFIG_X86_LOCAL_APIC
/*
* Currently unexpected vectors happen only on SMP and APIC.
@@ -244,7 +244,7 @@
desc->depth--;
break;
case 0:
- printk("enable_irq() unbalanced from %p\n",
+ printk(KERN_ERR "enable_irq() unbalanced from %p\n",
__builtin_return_address(0));
}
spin_unlock_irqrestore(&desc->lock, flags);
@@ -382,7 +382,8 @@
*/
if (irqflags & SA_SHIRQ) {
if (!dev_id)
- printk("Bad boy: %s (at 0x%x) called us without a dev_id!\n", devname, (&irq)[-1]);
+ printk(KERN_ERR "Bad boy: %s (at 0x%x) called us "
+ "without a dev_id!\n", devname, (&irq)[-1]);
}
#endif
@@ -534,7 +535,7 @@
kfree(action);
return;
}
- printk("Trying to free free IRQ%d\n",irq);
+ printk(KERN_ERR "Trying to free free IRQ%d\n",irq);
spin_unlock_irqrestore(&desc->lock,flags);
return;
}
diff -Naur -X exclude-files ac_cur/arch/um/kernel/mem.c ac/arch/um/kernel/mem.c
--- ac_cur/arch/um/kernel/mem.c Fri Jun 1 20:50:47 2001
+++ ac/arch/um/kernel/mem.c Fri Jun 1 22:17:25 2001
@@ -47,7 +47,7 @@
/* this will put all low memory onto the freelists */
totalram_pages += free_all_bootmem();
- printk("Memory: %luk available\n",
+ printk(KERN_INFO "Memory: %luk available\n",
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10));
}
@@ -78,7 +78,7 @@
void si_meminfo(struct sysinfo *val)
{
val->totalram = totalram_pages;
- val->sharedram = atomic_read(&shmem_nrpages);
+ val->sharedram = 0;
val->freeram = nr_free_pages();
val->bufferram = atomic_read(&buffermem_pages);
val->totalhigh = 0;
@@ -121,7 +121,7 @@
totalram_pages++;
}
}
-
+
#endif
int do_check_pgt_cache(int low, int high)
diff -Naur -X exclude-files ac_cur/arch/um/kernel/process.c ac/arch/um/kernel/process.c
--- ac_cur/arch/um/kernel/process.c Fri Jun 1 21:55:16 2001
+++ ac/arch/um/kernel/process.c Fri Jun 1 22:17:29 2001
@@ -83,7 +83,7 @@
set_sigstack(sig_stack);
flags = SA_ONSTACK;
}
- set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags, SIGVTALRM,
+ set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags, SIGVTALRM,
SIGUSR1, SIGALRM, SIGIO, -1);
set_handler(SIGTRAP, (__sighandler_t) sig_handler, flags, SIGVTALRM,
SIGUSR1, SIGALRM, SIGIO, -1);
@@ -201,8 +201,7 @@
save_altstack(NULL, UM_SP(regs));
kill(pid, SIGKILL);
if(waitpid(pid, NULL, WNOHANG) < 0)
- printk("setup_altstack : waitpid failed, errno = %d\n",
- errno);
+ printk("setup_altstack : waitpid failed, errno = %d\n", errno);
return(0);
}
diff -Naur -X exclude-files ac_cur/arch/um/kernel/process_kern.c ac/arch/um/kernel/process_kern.c
--- ac_cur/arch/um/kernel/process_kern.c Fri Jun 1 21:14:39 2001
+++ ac/arch/um/kernel/process_kern.c Fri Jun 1 22:17:34 2001
@@ -4,6 +4,7 @@
*/
#include "linux/config.h"
+#include "linux/kernel.h"
#include "linux/sched.h"
#include "linux/interrupt.h"
#include "linux/mm.h"
@@ -177,7 +178,7 @@
usr1_pid(getpid());
extern_pid = current->thread.request.u.thread.new_pid;
if(extern_pid < 0){
- printk("Kernel thread failed : errno = %d", -extern_pid);
+ printk(KERN_ERR "Kernel thread failed : errno = %d", -extern_pid);
return(extern_pid);
}
if(extern_pid_out != NULL) *extern_pid_out = extern_pid;
@@ -290,7 +291,7 @@
new_pid = start_fork_tramp(p->thread.kernel_stack, stack,
clone_vm, fork_tramp);
if(new_pid < 0){
- printk("copy_thread : clone failed with errno = %d",
+ printk(KERN_ERR "copy_thread : clone failed with errno = %d",
-new_pid);
return(new_pid);
}
@@ -422,7 +423,7 @@
static void do_idle(void)
{
idle_timer();
-
+
while(1){
/* endless idle loop with no priority at all */
current->nice = 20;
@@ -456,10 +457,11 @@
int i, pid;
if(ncpus > 1){
- printk("Starting up other processors:\n");
+ printk(KERN_INFO "Starting up other processors:\n");
for(i=1;i<ncpus;i++){
kernel_thread1(idle_proc, NULL, 0, i, &pid);
- printk("\t#%d - idle thread pid = %d\n", i, pid);
+ printk(KERN_INFO "\t#%d - idle thread pid = %d\n",
+ i, pid);
}
}
do_idle();
@@ -509,7 +511,8 @@
void force_sigbus(void)
{
- printk("Killing pid %d because of a lack of memory\n", current->pid);
+ printk(KERN_ERR "Killing pid %d because of a lack of memory\n",
+ current->pid);
lock_kernel();
sigaddset(¤t->pending.signal, SIGBUS);
recalc_sigpending(current);
@@ -673,13 +676,6 @@
EXPORT_SYMBOL(get_fault_addr);
-void set_fault_addr(void *addr)
-{
- current->thread.fault_addr = addr;
-}
-
-EXPORT_SYMBOL(set_fault_addr);
-
int singlestepping(void *t)
{
struct task_struct *task;
@@ -693,7 +689,7 @@
void not_implemented(void)
{
- printk("Something isn't implemented in here\n");
+ printk(KERN_DEBUG "Something isn't implemented in here\n");
}
EXPORT_SYMBOL(not_implemented);
diff -Naur -X exclude-files ac_cur/arch/um/kernel/smp.c ac/arch/um/kernel/smp.c
--- ac_cur/arch/um/kernel/smp.c Fri Jun 1 20:50:47 2001
+++ ac/arch/um/kernel/smp.c Fri Jun 1 22:17:38 2001
@@ -50,7 +50,7 @@
{
int cpu = smp_processor_id();
- printk("\n%s, CPU %d:\n", str, cpu);
+ printk(KERN_INFO "\n%s, CPU %d:\n", str, cpu);
}
#define MAXCOUNT 100000000
@@ -83,7 +83,7 @@
void smp_send_stop(void)
{
- printk("Stopping all CPUs\n");
+ printk(KERN_INFO "Stopping all CPUs\n");
}
void smp_commence(void)
@@ -93,18 +93,20 @@
void smp_boot_cpus(void)
{
if(ncpus < 1){
- printk("ncpus set to 1\n");
+ printk(KERN_INFO "ncpus set to 1\n");
ncpus = 1;
}
else if(ncpus > NR_CPUS){
- printk("ncpus can't be greater than NR_CPUS, set to %d\n", NR_CPUS);
+ printk(KERN_INFO
+ "ncpus can't be greater than NR_CPUS, set to %d\n",
+ NR_CPUS);
ncpus = NR_CPUS;
}
}
int setup_profiling_timer(unsigned int multiplier)
{
- printk("setup_profiling_timer\n");
+ printk(KERN_INFO "setup_profiling_timer\n");
return(0);
}
diff -Naur -X exclude-files ac_cur/arch/um/kernel/time_kern.c ac/arch/um/kernel/time_kern.c
--- ac_cur/arch/um/kernel/time_kern.c Fri Jun 1 21:40:25 2001
+++ ac/arch/um/kernel/time_kern.c Fri Jun 1 22:17:52 2001
@@ -79,7 +79,7 @@
for(i=0;i<loops_per_jiffy * HZ;i++) ;
}
-extern void __udelay(um_udelay_t usecs)
+void __udelay(um_udelay_t usecs)
{
int i, n;
@@ -87,7 +87,7 @@
for(i=0;i<n;i++) ;
}
-extern void __const_udelay(um_udelay_t usecs)
+void __const_udelay(um_udelay_t usecs)
{
int i, n;
@@ -101,7 +101,7 @@
if((err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer",
NULL)) != 0)
- printk("timer_init : request_irq failed - errno = %d\n", -err);
+ printk(KERN_ERR "timer_init : request_irq failed - errno = %d\n", -err);
timer_irq_inited = 1;
return(0);
}
diff -Naur -X exclude-files ac_cur/arch/um/kernel/trap_kern.c ac/arch/um/kernel/trap_kern.c
--- ac_cur/arch/um/kernel/trap_kern.c Fri Jun 1 21:18:02 2001
+++ ac/arch/um/kernel/trap_kern.c Fri Jun 1 22:17:49 2001
@@ -47,8 +47,7 @@
current->thread.fault_addr = (void *) address;
up_read(&mm->mmap_sem);
do_longjmp(current->thread.fault_catcher);
- }
- else if(current->thread.fault_addr != NULL){
+ } else if(current->thread.fault_addr != NULL){
panic("fault_addr set but no fault catcher");
}
if(!is_user)
@@ -91,7 +90,7 @@
} while(is_write && !pte_write(*pte));
if(is_write && !pte_write(*pte)) panic("page not writeable");
if(!is_write && !pte_present(*pte)){
- printk("Page disappeared while handling fault");
+ printk(KERN_ERR "Page disappeared while handling fault");
force_sigbus();
}
flush_tlb_page(vma, page);
@@ -153,7 +152,7 @@
void signal_usr1(int sig)
{
if(debugger_pid != -1){
- printk("The debugger is already running\n");
+ printk(KERN_ERR "The debugger is already running\n");
return;
}
if(parse_chan_pair(gdb_init, 0, &gdb_chan, INIT_ONE, &opts)) return;
@@ -205,7 +204,7 @@
void child_signal(pid_t pid, int status){ }
int init_ptrace_proxy(int idle_pid, int startup, int stop)
{
- printk("debug requested when CONFIG_PT_PROXY is off\n");
+ printk(KERN_ERR "debug requested when CONFIG_PT_PROXY is off\n");
wait_for_stop(idle_pid, SIGSTOP, PTRACE_CONT);
ptrace(PTRACE_CONT, idle_pid, 0, 0);
return(-1);
@@ -213,12 +212,12 @@
void signal_usr1(int sig)
{
- printk("debug requested when CONFIG_PT_PROXY is off\n");
+ printk(KERN_ERR "debug requested when CONFIG_PT_PROXY is off\n");
}
int attach_debugger(int idle_pid, int pid)
{
- printk("attach_debugger called when CONFIG_PT_PROXY is off\n");
+ printk(KERN_ERR "attach_debugger called when CONFIG_PT_PROXY is off\n");
return(-1);
}
#endif
diff -Naur -X exclude-files ac_cur/arch/um/kernel/user_util.c ac/arch/um/kernel/user_util.c
--- ac_cur/arch/um/kernel/user_util.c Fri Jun 1 20:50:47 2001
+++ ac/arch/um/kernel/user_util.c Fri Jun 1 22:17:41 2001
@@ -276,7 +276,8 @@
!WIFSTOPPED(status) || (WSTOPSIG(status) != sig)){
if(ret < 0){
if(errno == EINTR) continue;
- printk("wait failed, errno = %d\n", errno);
+ printk("wait failed, errno = %d\n",
+ errno);
}
else if(WIFEXITED(status))
printk("process exited with status %d\n",
diff -Naur -X exclude-files ac_cur/arch/um/ptproxy/proxy.c ac/arch/um/ptproxy/proxy.c
--- ac_cur/arch/um/ptproxy/proxy.c Fri Jun 1 20:50:47 2001
+++ ac/arch/um/ptproxy/proxy.c Fri Jun 1 22:17:45 2001
@@ -261,11 +261,11 @@
exit(1);
}
execlp("gdb", "gdb", arg, prog, NULL);
- printk("start_debugger : exec of gdb failed, errno = %d\n",
+ printk("start_debugger : exec of gdb failed, errno = %d\n",
errno);
}
if(child < 0){
- printk("start_debugger : fork for gdb failed, errno = %d\n",
+ printk("start_debugger : fork for gdb failed, errno = %d\n",
errno);
return(-1);
}