From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758166Ab2DYKkq (ORCPT ); Wed, 25 Apr 2012 06:40:46 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:35932 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756970Ab2DYKkp (ORCPT ); Wed, 25 Apr 2012 06:40:45 -0400 Date: Wed, 25 Apr 2012 14:40:40 +0400 From: Cyrill Gorcunov To: Andrew Morton Cc: LKML , Oleg Nesterov , Kees Cook , Pavel Emelyanov , Serge Hallyn , KAMEZAWA Hiroyuki Subject: [PATCH -mm] c/r: fs, proc: Move children entry back to tid_base_stuff Message-ID: <20120425104040.GB21469@moon> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While merging to linux-next the "children" entry jumped from tid_base_stuff to tgid_base_stuff by mistake. Fix it, by moving it back. Signed-off-by: Cyrill Gorcunov Cc: Oleg Nesterov Cc: Kees Cook Cc: Pavel Emelyanov Cc: Serge Hallyn Cc: KAMEZAWA Hiroyuki Cc: Andrew Morton --- Andrew, I suspect this nit happened when the patch was merged to linux-next. fs/proc/base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6.git/fs/proc/base.c =================================================================== --- linux-2.6.git.orig/fs/proc/base.c +++ linux-2.6.git/fs/proc/base.c @@ -2990,9 +2990,6 @@ static const struct pid_entry tgid_base_ ONE("stat", S_IRUGO, proc_tgid_stat), ONE("statm", S_IRUGO, proc_pid_statm), REG("maps", S_IRUGO, proc_pid_maps_operations), -#ifdef CONFIG_CHECKPOINT_RESTORE - REG("children", S_IRUGO, proc_tid_children_operations), -#endif #ifdef CONFIG_NUMA REG("numa_maps", S_IRUGO, proc_pid_numa_maps_operations), #endif @@ -3352,6 +3349,9 @@ static const struct pid_entry tid_base_s ONE("stat", S_IRUGO, proc_tid_stat), ONE("statm", S_IRUGO, proc_pid_statm), REG("maps", S_IRUGO, proc_tid_maps_operations), +#ifdef CONFIG_CHECKPOINT_RESTORE + REG("children", S_IRUGO, proc_tid_children_operations), +#endif #ifdef CONFIG_NUMA REG("numa_maps", S_IRUGO, proc_tid_numa_maps_operations), #endif