git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
kernel
/
traps.c
diff --git
a/arch/m68k/kernel/traps.c
b/arch/m68k/kernel/traps.c
index
4569406
..
0c7bd19
100644
(file)
--- a/
arch/m68k/kernel/traps.c
+++ b/
arch/m68k/kernel/traps.c
@@
-326,13
+326,13
@@
static inline int do_040writeback1(unsigned short wbs, unsigned long wba,
switch (wbs & WBSIZ_040) {
case BA_SIZE_BYTE:
switch (wbs & WBSIZ_040) {
case BA_SIZE_BYTE:
- res = put_user(wbd & 0xff, (char *)wba);
+ res = put_user(wbd & 0xff, (char
__user
*)wba);
break;
case BA_SIZE_WORD:
break;
case BA_SIZE_WORD:
- res = put_user(wbd & 0xffff, (short *)wba);
+ res = put_user(wbd & 0xffff, (short
__user
*)wba);
break;
case BA_SIZE_LONG:
break;
case BA_SIZE_LONG:
- res = put_user(wbd, (int *)wba);
+ res = put_user(wbd, (int
__user
*)wba);
break;
}
break;
}
@@
-899,8
+899,8
@@
void show_registers(struct pt_regs *regs)
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
- printk("Process %s (pid: %d, task=%p)\n",
- current->comm, current->pid, current);
+ printk("Process %s (pid: %d
[#%u]
, task=%p)\n",
+ current->comm, current->pid, current
->xid, current
);
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {