From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756946AbYCAHvW (ORCPT ); Sat, 1 Mar 2008 02:51:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753933AbYCAHvL (ORCPT ); Sat, 1 Mar 2008 02:51:11 -0500 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:50920 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752970AbYCAHvK (ORCPT ); Sat, 1 Mar 2008 02:51:10 -0500 Date: Sat, 01 Mar 2008 16:51:28 +0900 From: KOSAKI Motohiro To: "J. Bruce Fields" , linux-ia64@vger.kernel.org Subject: [PATCH][2.6.25-rc2-mm1] ia64: remove unnecessary nfs includes from sys_ia32.c Cc: kosaki.motohiro@jp.fujitsu.com, Andrew Morton , LKML Message-Id: <20080301164035.528F.KOSAKI.MOTOHIRO@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.42 [ja] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi if compile 2.6.25-rc2-mm1 on ia64, output many warnings. ---------------------------------------------------------------- % LANG=C make arch/ia64/ia32/sys_ia32.o <-mm1% LANG=C make arch/ia64/ia32/sys_ia32.o CHK include/linux/version.h CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CC arch/ia64/ia32/sys_ia32.o In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:297:1: warning: "elf_check_arch" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/device.h:21, from include/linux/backing-dev.h:15, from include/linux/nfs_fs_sb.h:5, from include/linux/nfs_fs.h:50, from arch/ia64/ia32/sys_ia32.c:35: include/asm/elf.h:19:1: warning: this is the location of the previous definition In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:302:1: warning: "ELF_CLASS" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/device.h:21, from include/linux/backing-dev.h:15, from include/linux/nfs_fs_sb.h:5, from include/linux/nfs_fs.h:50, from arch/ia64/ia32/sys_ia32.c:35: include/asm/elf.h:24:1: warning: this is the location of the previous definition In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:304:1: warning: "ELF_ARCH" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/device.h:21, from include/linux/backing-dev.h:15, from include/linux/nfs_fs_sb.h:5, from include/linux/nfs_fs.h:50, from arch/ia64/ia32/sys_ia32.c:35: include/asm/elf.h:26:1: warning: this is the location of the previous definition In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:318:1: warning: "ELF_EXEC_PAGESIZE" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/device.h:21, from include/linux/backing-dev.h:15, from include/linux/nfs_fs_sb.h:5, from include/linux/nfs_fs.h:50, from arch/ia64/ia32/sys_ia32.c:35: include/asm/elf.h:34:1: warning: this is the location of the previous definition In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:327:1: warning: "ELF_ET_DYN_BASE" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/device.h:21, from include/linux/backing-dev.h:15, from include/linux/nfs_fs_sb.h:5, from include/linux/nfs_fs.h:50, from arch/ia64/ia32/sys_ia32.c:35: include/asm/elf.h:43:1: warning: this is the location of the previous definition In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:330:1: warning: "ELF_PLAT_INIT" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/device.h:21, from include/linux/backing-dev.h:15, from include/linux/nfs_fs_sb.h:5, from include/linux/nfs_fs.h:50, from arch/ia64/ia32/sys_ia32.c:35: include/asm/elf.h:140:1: warning: this is the location of the previous definition In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:342:1: warning: "SET_PERSONALITY" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/device.h:21, from include/linux/backing-dev.h:15, from include/linux/nfs_fs_sb.h:5, from include/linux/nfs_fs.h:50, from arch/ia64/ia32/sys_ia32.c:35: include/asm/elf.h:180:1: warning: this is the location of the previous definition ------------------------------------------------------------------------ IA64 support 2 ELF format (IA64 binary and IA32 binary), thus if 2 elf related header included, cause many warning or error. about 2 week ago, J. Bruce Fields proposed this problem fixed patch. (http://marc.info/?l=linux-ia64&m=120329313305695&w=2) but unfortunately, it can't applied -mm tree. I rebase against 2.6.25-rc2-mm1. Signed-off-by: J. Bruce Fields Signed-off-by: KOSAKI Motohiro --- arch/ia64/ia32/sys_ia32.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) Index: b/arch/ia64/ia32/sys_ia32.c =================================================================== --- a/arch/ia64/ia32/sys_ia32.c 2008-02-18 17:13:15.000000000 +0900 +++ b/arch/ia64/ia32/sys_ia32.c 2008-03-01 16:48:36.000000000 +0900 @@ -32,13 +32,8 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include -#include #include #include #include