import changes from rmottola/Arctic-Fox:

- Bug 1135903 - OdinMonkey: Check the siginfo si_code field before handling a SIGSEGV (e5452f1ac)
- Bug 1112164 part 5 - Distinguish between the FloatRegister code and the encoding on x86 & x64. (7e27e254d)
- Bug 1152176 - xpcom: Define linux kernel BLOCK_SIZE if necessary. (4ff9c701e)

xpcom/io/nsLocalFileUnix.cpp

@@ -31,6 +31,9 @@
 #define USE_LINUX_QUOTACTL
 #include <sys/mount.h>
 #include <sys/quota.h>
+#ifndef BLOCK_SIZE
+#define BLOCK_SIZE 1024 /* kernel block size */
+#endif
 #endif
 
 #include "xpcom-private.h"