mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
timer_list: Guard procfs specific code
[ Upstream commit a9314773a9
]
With CONFIG_PROC_FS=n the following warning is emitted:
kernel/time/timer_list.c:361:36: warning: unused variable
'timer_list_sops' [-Wunused-const-variable]
static const struct seq_operations timer_list_sops = {
Add #ifdef guard around procfs specific code.
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Cc: john.stultz@linaro.org
Cc: sboyd@kernel.org
Cc: clang-built-linux@googlegroups.com
Link: https://github.com/ClangBuiltLinux/linux/issues/534
Link: https://lkml.kernel.org/r/20190614181604.112297-1-nhuck@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
d86c0b73f7
commit
b9f547b7bd
1 changed files with 19 additions and 17 deletions
|
@ -287,23 +287,6 @@ static inline void timer_list_header(struct seq_file *m, u64 now)
|
|||
SEQ_printf(m, "\n");
|
||||
}
|
||||
|
||||
static int timer_list_show(struct seq_file *m, void *v)
|
||||
{
|
||||
struct timer_list_iter *iter = v;
|
||||
|
||||
if (iter->cpu == -1 && !iter->second_pass)
|
||||
timer_list_header(m, iter->now);
|
||||
else if (!iter->second_pass)
|
||||
print_cpu(m, iter->cpu, iter->now);
|
||||
#ifdef CONFIG_GENERIC_CLOCKEVENTS
|
||||
else if (iter->cpu == -1 && iter->second_pass)
|
||||
timer_list_show_tickdevices_header(m);
|
||||
else
|
||||
print_tickdevice(m, tick_get_device(iter->cpu), iter->cpu);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
void sysrq_timer_list_show(void)
|
||||
{
|
||||
u64 now = ktime_to_ns(ktime_get());
|
||||
|
@ -322,6 +305,24 @@ void sysrq_timer_list_show(void)
|
|||
return;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static int timer_list_show(struct seq_file *m, void *v)
|
||||
{
|
||||
struct timer_list_iter *iter = v;
|
||||
|
||||
if (iter->cpu == -1 && !iter->second_pass)
|
||||
timer_list_header(m, iter->now);
|
||||
else if (!iter->second_pass)
|
||||
print_cpu(m, iter->cpu, iter->now);
|
||||
#ifdef CONFIG_GENERIC_CLOCKEVENTS
|
||||
else if (iter->cpu == -1 && iter->second_pass)
|
||||
timer_list_show_tickdevices_header(m);
|
||||
else
|
||||
print_tickdevice(m, tick_get_device(iter->cpu), iter->cpu);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void *move_iter(struct timer_list_iter *iter, loff_t offset)
|
||||
{
|
||||
for (; offset; offset--) {
|
||||
|
@ -381,3 +382,4 @@ static int __init init_timer_list_procfs(void)
|
|||
return 0;
|
||||
}
|
||||
__initcall(init_timer_list_procfs);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue