From b873dadb600d1bc2bab3643b74fcbf49d42cd98a Mon Sep 17 00:00:00 2001 From: Bobi Jam Date: Tue, 11 Dec 2012 11:04:22 +0800 Subject: [PATCH] LU-1484 kernel: pass RHEL5 build for 2.6.18-308 For vanilla kernel, proc_dir_entry::deleted and ::pde_users co-exists from 2.6.23 to 2.6.23.17. For some RHEL5 kernels, it defines co-existings proc_dir_entry::deleted and proc_dir_entry_aux::pde_users. Signed-off-by: Bobi Jam Change-Id: I107e15e6e7d41680c99b324c35ddac0a7c3716e6 Reviewed-on: http://review.whamcloud.com/4794 Tested-by: Hudson Reviewed-by: Peng Tao Reviewed-by: Stephen Champion Tested-by: Maloo Reviewed-by: Oleg Drokin --- libcfs/include/libcfs/params_tree.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libcfs/include/libcfs/params_tree.h b/libcfs/include/libcfs/params_tree.h index 635d6bc..b386413 100644 --- a/libcfs/include/libcfs/params_tree.h +++ b/libcfs/include/libcfs/params_tree.h @@ -109,10 +109,6 @@ do { \ #ifdef HAVE_PROCFS_DELETED -#ifdef HAVE_PROCFS_USERS -#error proc_dir_entry->deleted is conflicted with proc_dir_entry->pde_users -#endif - static inline int LPROCFS_ENTRY_AND_CHECK(struct proc_dir_entry *dp) { -- 1.8.3.1