From 5f3730475a780daa8a2820588c09016d8bff9e67 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Thu, 15 Nov 2012 19:17:20 +0800 Subject: [PATCH 1/1] LU-1484 kernel: fix build error with 2.6.18 kernel When crossing building 2.6.18 kernel, I always got following errors: lustre-release/libcfs/include/libcfs/params_tree.h:107:2: error: #error proc_dir_entry->deleted is conflicted with proc_dir_entry->pde_users It is because after commit 76bf16d1, HAVE_PROCFS_USERS and HAVE_PROCFS_DELETED can both be true on old kernels with backported code. Signed-off-by: Peng Tao Change-Id: I2b420f401f221c619b9643acee2ff54057af0fc9 Reviewed-on: http://review.whamcloud.com/4589 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Bobi Jam --- 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 927ede9..fac664e 100644 --- a/libcfs/include/libcfs/params_tree.h +++ b/libcfs/include/libcfs/params_tree.h @@ -103,10 +103,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