Fix Sparc32 Build

Hi David,

asm-generic/fcntl.h is needed in asm-sparc/fcntl.h.

The #defines in asm-generic/fcntl.h are protected with #if's so will not override thoes in asm-sparc/fcntl.h

Regards
Mark Fortescue.

From: Mark Fortescue <[email protected]>

Correct incorrect removal of asm-generic/fcntl.h from asm-sparc/fcntl.h by commit 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b.

---

@@ -32,5 +32,6 @@
 #define __ARCH_FLOCK_PAD	short __unused;
 #define __ARCH_FLOCK64_PAD	short __unused;
 
+#include <asm-generic/fcntl.h>
 
 #endif

From: Mark Fortescue <[email protected]>
Date: Sat, 4 Aug 2007 15:28:26 +0100 (BST)

I'll apply this, thanks Mark.

I thought the sparc32 and sparc64 fcntl.h files were more in sync than they actually were, sorry :)

Fix sparc32 build error due to undefined bool type.

CC [M] fs/ocfs2/dlm/userdlm.o
In file included from include/asm/sigcontext.h:6,
from include/asm/signal.h:5,
from include/linux/signal.h:4,
from fs/ocfs2/dlm/userdlm.c:30:
include/asm/ptrace.h:42: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘pt_regs_is_syscall’ include/asm/ptrace.h:47: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘pt_regs_clear_syscall’ make[3]: *** [fs/ocfs2/dlm/userdlm.o] Error 1
make[2]: *** [fs/ocfs2/dlm] Error 2
make[1]: *** [fs/ocfs2] Error 2
make: *** [fs] Error 2

index 6b5e6ce..0afb867 100644
@@ -10,6 +10,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
+
 struct pt_regs {
 	unsigned long psr;
 	unsigned long pc;

From: Robert Reif <[email protected]>
Date: Sun, 11 May 2008 18:35:19 -0400

Sorry Robert, I did several test builds in an effort to avoid something like this :-/

Applied, thanks!