projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
s390
/
cio
/
cio.c
diff --git
a/drivers/s390/cio/cio.c
b/drivers/s390/cio/cio.c
index
8ee88c4
..
d691e6a
100644
(file)
--- a/
drivers/s390/cio/cio.c
+++ b/
drivers/s390/cio/cio.c
@@
-28,7
+28,7
@@
#include <asm/chpid.h>
#include <asm/airq.h>
#include <asm/isc.h>
#include <asm/chpid.h>
#include <asm/airq.h>
#include <asm/isc.h>
-#include <
asm
/cputime.h>
+#include <
linux
/cputime.h>
#include <asm/fcx.h>
#include <asm/nmi.h>
#include <asm/crw.h>
#include <asm/fcx.h>
#include <asm/nmi.h>
#include <asm/crw.h>
@@
-54,7
+54,7
@@
debug_info_t *cio_debug_crw_id;
*/
static int __init cio_debug_init(void)
{
*/
static int __init cio_debug_init(void)
{
- cio_debug_msg_id = debug_register("cio_msg", 16, 1, 1
6
* sizeof(long));
+ cio_debug_msg_id = debug_register("cio_msg", 16, 1, 1
1
* sizeof(long));
if (!cio_debug_msg_id)
goto out_unregister;
debug_register_view(cio_debug_msg_id, &debug_sprintf_view);
if (!cio_debug_msg_id)
goto out_unregister;
debug_register_view(cio_debug_msg_id, &debug_sprintf_view);
@@
-64,7
+64,7
@@
static int __init cio_debug_init(void)
goto out_unregister;
debug_register_view(cio_debug_trace_id, &debug_hex_ascii_view);
debug_set_level(cio_debug_trace_id, 2);
goto out_unregister;
debug_register_view(cio_debug_trace_id, &debug_hex_ascii_view);
debug_set_level(cio_debug_trace_id, 2);
- cio_debug_crw_id = debug_register("cio_crw",
16, 1, 16
* sizeof(long));
+ cio_debug_crw_id = debug_register("cio_crw",
8, 1, 8
* sizeof(long));
if (!cio_debug_crw_id)
goto out_unregister;
debug_register_view(cio_debug_crw_id, &debug_sprintf_view);
if (!cio_debug_crw_id)
goto out_unregister;
debug_register_view(cio_debug_crw_id, &debug_sprintf_view);