From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753883AbXJ1L2K (ORCPT ); Sun, 28 Oct 2007 07:28:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751215AbXJ1L16 (ORCPT ); Sun, 28 Oct 2007 07:27:58 -0400 Received: from E23SMTP03.au.ibm.com ([202.81.18.172]:49060 "EHLO e23smtp03.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751121AbXJ1L15 (ORCPT ); Sun, 28 Oct 2007 07:27:57 -0400 Date: Thu, 25 Oct 2007 16:38:02 +0530 From: Balbir Singh To: Ingo Molnar Cc: linux-kernel@vger.kernel.org Subject: X86: UML build fix Message-ID: <20071025110801.GA20633@linux.vnet.ibm.com> Reply-To: balbir@linux.vnet.ibm.com MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org [sorry if this is a duplicate, looks like my first post did not make it to lkml] Fix stat.h to not use __i386__, but use BITS_PER_LONG. The UML architecture in turn includes this file. This helps resolve one build failure in the current UML code Before the fix, the failure was In file included from init/do_mounts.c:19: init/do_mounts.h: In function 'bstat': init/do_mounts.h:25: error: storage size of 'stat' isn't known init/do_mounts.h:25: warning: unused variable 'stat' init/do_mounts.h:33: warning: control reaches end of non-void function make[1]: *** [init/do_mounts.o] Error 1 make: *** [init/do_mounts.o] Error 2 Signed-off-by: Balbir Singh --- include/asm-x86/stat.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN init/do_mounts.h~uml-fix-init-domounts init/do_mounts.h diff -puN include/asm-x86/stat.h~uml-fix-init-domounts include/asm-x86/stat.h --- 2.6.24-rc1/include/asm-x86/stat.h~uml-fix-init-domounts 2007-10-25 16:23:04.000000000 +0530 +++ 2.6.24-rc1-balbir/include/asm-x86/stat.h 2007-10-25 16:23:04.000000000 +0530 @@ -1,9 +1,11 @@ #ifndef _ASM_X86_STAT_H #define _ASM_X86_STAT_H +#include + #define STAT_HAVE_NSEC 1 -#ifdef __i386__ +#if BITS_PER_LONG == 32 struct stat { unsigned long st_dev; unsigned long st_ino; @@ -63,7 +65,7 @@ struct stat64 { unsigned long long st_ino; }; -#else /* __i386__ */ +#else /* BITS_PER_LONG == 32 */ struct stat { unsigned long st_dev; _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL