| .. | .. |
|---|
| 89 | 89 | #undef DIONAME |
|---|
| 90 | 90 | #undef DIOFBNAME |
|---|
| 91 | 91 | |
|---|
| 92 | | -static const char *unknowndioname |
|---|
| 93 | | - = "unknown DIO board -- please email <linux-m68k@lists.linux-m68k.org>!"; |
|---|
| 92 | +static const char unknowndioname[] |
|---|
| 93 | + = "unknown DIO board, please email linux-m68k@lists.linux-m68k.org"; |
|---|
| 94 | 94 | |
|---|
| 95 | 95 | static const char *dio_getname(int id) |
|---|
| 96 | 96 | { |
|---|
| .. | .. |
|---|
| 135 | 135 | else |
|---|
| 136 | 136 | va = ioremap(pa, PAGE_SIZE); |
|---|
| 137 | 137 | |
|---|
| 138 | | - if (probe_kernel_read(&i, (unsigned char *)va + DIO_IDOFF, 1)) { |
|---|
| 138 | + if (copy_from_kernel_nofault(&i, |
|---|
| 139 | + (unsigned char *)va + DIO_IDOFF, 1)) { |
|---|
| 139 | 140 | if (scode >= DIOII_SCBASE) |
|---|
| 140 | 141 | iounmap(va); |
|---|
| 141 | 142 | continue; /* no board present at that select code */ |
|---|
| .. | .. |
|---|
| 208 | 209 | else |
|---|
| 209 | 210 | va = ioremap(pa, PAGE_SIZE); |
|---|
| 210 | 211 | |
|---|
| 211 | | - if (probe_kernel_read(&i, (unsigned char *)va + DIO_IDOFF, 1)) { |
|---|
| 212 | + if (copy_from_kernel_nofault(&i, |
|---|
| 213 | + (unsigned char *)va + DIO_IDOFF, 1)) { |
|---|
| 212 | 214 | if (scode >= DIOII_SCBASE) |
|---|
| 213 | 215 | iounmap(va); |
|---|
| 214 | 216 | continue; /* no board present at that select code */ |
|---|