[x86 patch] Fix UML init/do_mounts.h build failure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <[email protected]>
---

 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 <asm/types.h>
+
 #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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux