The patch titled
Subject: procfs: add conditional compilation check
has been added to the -mm tree. Its filename is
procfs-add-conditional-compilation-check.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/procfs-add-conditional-compilation-check.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/procfs-add-conditional-compilation-check.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Eric Engestrom <eric.engestrom@xxxxxxxxxx>
Subject: procfs: add conditional compilation check
`proc_timers_operations` is only used when CONFIG_CHECKPOINT_RESTORE
is enabled.
Signed-off-by: Eric Engestrom <eric.engestrom@xxxxxxxxxx>
Acked-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/base.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN fs/proc/base.c~procfs-add-conditional-compilation-check fs/proc/base.c
--- a/fs/proc/base.c~procfs-add-conditional-compilation-check
+++ a/fs/proc/base.c
@@ -2158,6 +2158,7 @@ static const struct file_operations proc
.llseek = default_llseek,
};
+#ifdef CONFIG_CHECKPOINT_RESTORE
struct timers_private {
struct pid *pid;
struct task_struct *task;
@@ -2256,6 +2257,7 @@ static const struct file_operations proc
.llseek = seq_lseek,
.release = seq_release_private,
};
+#endif
static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,
size_t count, loff_t *offset)
_
Patches currently in -mm which might be from eric.engestrom@xxxxxxxxxx are
procfs-add-conditional-compilation-check.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
