diff --git a/[refs] b/[refs] index adba2786be42..e5cd1f064f9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e7371c1a11f041d641cc0ff113bf1daa1bd98b9 +refs/heads/master: 83ff7df5f1c1c44efd84d7341211aa0138fd9504 diff --git a/trunk/arch/um/kernel/trap.c b/trunk/arch/um/kernel/trap.c index 0c467fa08870..abab90c3803f 100644 --- a/trunk/arch/um/kernel/trap.c +++ b/trunk/arch/um/kernel/trap.c @@ -229,8 +229,8 @@ void relay_signal(int sig, union uml_pt_regs *regs) if(!UPT_IS_USER(regs)){ if(sig == SIGBUS) - printk("Bus error - the /dev/shm or /tmp mount likely " - "just ran out of space\n"); + printk("Bus error - the host /dev/shm or /tmp mount " + "likely just ran out of space\n"); panic("Kernel mode signal %d", sig); }