From a156245300d5362a3b4c4afdace9e2b90169fe43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 26 Mar 2016 04:42:12 -0300 Subject: Remove UKSM support since the latest patch is very unstable and obsolete for the 4.5-gnu kernel version --- fs/exec.c | 4 +--- fs/proc/meminfo.c | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'fs') diff --git a/fs/exec.c b/fs/exec.c index 2af88108e..ab176c0d7 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -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 @@ -56,7 +56,6 @@ #include #include #include -#include #include @@ -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 -- cgit v1.2.3