diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-01-30 11:22:39 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-01-30 11:22:39 +0100 |
| commit | 9556ad6ad0c60a23a7db36af65c9ffff51bbf644 (patch) | |
| tree | 1464f3b838ba56404c2959f0d96ed8f523486378 /fs | |
| parent | 4c45c5167c9563b1a2eee3e2fe954621355e4ca8 (diff) | |
| parent | b18b6a9cef7f30e9a8b7738d5fc8d568cf660855 (diff) | |
| download | linux-9556ad6ad0c60a23a7db36af65c9ffff51bbf644.tar.gz linux-9556ad6ad0c60a23a7db36af65c9ffff51bbf644.tar.xz | |
Merge branch 'fortglx/4.11/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
- Remove unused functions
- Document udelay inaccuracy
- Remove posix timer data from task struct when posix timers are off
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 8e7e61b28f31..03deeac1e835 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2179,7 +2179,7 @@ static const struct file_operations proc_map_files_operations = { .llseek = generic_file_llseek, }; -#ifdef CONFIG_CHECKPOINT_RESTORE +#if defined(CONFIG_CHECKPOINT_RESTORE) && defined(CONFIG_POSIX_TIMERS) struct timers_private { struct pid *pid; struct task_struct *task; @@ -2936,7 +2936,7 @@ static const struct pid_entry tgid_base_stuff[] = { REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations), REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations), #endif -#ifdef CONFIG_CHECKPOINT_RESTORE +#if defined(CONFIG_CHECKPOINT_RESTORE) && defined(CONFIG_POSIX_TIMERS) REG("timers", S_IRUGO, proc_timers_operations), #endif REG("timerslack_ns", S_IRUGO|S_IWUGO, proc_pid_set_timerslack_ns_operations), |