diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exec.c | 4 | ||||
| -rw-r--r-- | fs/proc/meminfo.c | 6 |
2 files changed, 1 insertions, 9 deletions
@@ -19,7 +19,7 @@ * current->executable is only used by the procfs. This allows a dispatch * table to check for several different types of binary formats. We keep * trying until we recognize the file or we run out of supported binary - * formats. + * formats. */ #include <linux/slab.h> @@ -56,7 +56,6 @@ #include <linux/pipe_fs_i.h> #include <linux/oom.h> #include <linux/compat.h> -#include <linux/ksm.h> #include <trace/events/fs.h> @@ -1167,7 +1166,6 @@ void setup_new_exec(struct linux_binprm * bprm) /* An exec changes our domain. We are no longer part of the thread group */ current->self_exec_id++; - flush_signal_handlers(current, 0); do_close_on_exec(current->files); } diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 70b9f953b..df4661aba 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -118,9 +118,6 @@ static int meminfo_proc_show(struct seq_file *m, void *v) "SUnreclaim: %8lu kB\n" "KernelStack: %8lu kB\n" "PageTables: %8lu kB\n" -#ifdef CONFIG_UKSM - "KsmZeroPages: %8lu kB\n" -#endif #ifdef CONFIG_QUICKLIST "Quicklists: %8lu kB\n" #endif @@ -179,9 +176,6 @@ static int meminfo_proc_show(struct seq_file *m, void *v) K(global_page_state(NR_SLAB_UNRECLAIMABLE)), global_page_state(NR_KERNEL_STACK) * THREAD_SIZE / 1024, K(global_page_state(NR_PAGETABLE)), -#ifdef CONFIG_UKSM - K(global_page_state(NR_UKSM_ZERO_PAGES)), -#endif #ifdef CONFIG_QUICKLIST K(quicklist_total_size()), #endif |