diff options
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/debug.c | 3 | ||||
-rw-r--r-- | arch/s390/kernel/time.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 51653d82d7df..eca3fe595ff4 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -852,7 +852,6 @@ debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level, | |||
852 | static int debug_stoppable=1; | 852 | static int debug_stoppable=1; |
853 | static int debug_active=1; | 853 | static int debug_active=1; |
854 | 854 | ||
855 | #define CTL_S390DBF 5677 | ||
856 | #define CTL_S390DBF_STOPPABLE 5678 | 855 | #define CTL_S390DBF_STOPPABLE 5678 |
857 | #define CTL_S390DBF_ACTIVE 5679 | 856 | #define CTL_S390DBF_ACTIVE 5679 |
858 | 857 | ||
@@ -1054,7 +1053,7 @@ __init debug_init(void) | |||
1054 | { | 1053 | { |
1055 | int rc = 0; | 1054 | int rc = 0; |
1056 | 1055 | ||
1057 | s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table, 1); | 1056 | s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table); |
1058 | down(&debug_lock); | 1057 | down(&debug_lock); |
1059 | debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT,NULL); | 1058 | debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT,NULL); |
1060 | printk(KERN_INFO "debug: Initialization complete\n"); | 1059 | printk(KERN_INFO "debug: Initialization complete\n"); |
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 3b91f27ab202..ee9fd7b85928 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -312,7 +312,7 @@ static struct clocksource clocksource_tod = { | |||
312 | .mask = -1ULL, | 312 | .mask = -1ULL, |
313 | .mult = 1000, | 313 | .mult = 1000, |
314 | .shift = 12, | 314 | .shift = 12, |
315 | .is_continuous = 1, | 315 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
316 | }; | 316 | }; |
317 | 317 | ||
318 | 318 | ||