diff --git a/[refs] b/[refs] index e4e8045df3c4..0b984b4d838a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0494f6ec5d3a015d53b57e37280b93c19446676a +refs/heads/master: 5e21ccb136047e556acf0fdf227cab5db05c1c25 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 73b1e94171b7..24eed139e54e 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -119,7 +119,6 @@ enum pid_directory_inos { #ifdef CONFIG_AUDITSYSCALL PROC_TGID_LOGINUID, #endif - PROC_TGID_FD_DIR, PROC_TGID_OOM_SCORE, PROC_TGID_OOM_ADJUST, PROC_TID_INO, @@ -158,9 +157,11 @@ enum pid_directory_inos { #ifdef CONFIG_AUDITSYSCALL PROC_TID_LOGINUID, #endif - PROC_TID_FD_DIR = 0x8000, /* 0x8000-0xffff */ PROC_TID_OOM_SCORE, PROC_TID_OOM_ADJUST, + + /* Add new entries before this */ + PROC_TID_FD_DIR = 0x8000, /* 0x8000-0xffff */ }; struct pid_entry {