5 files changed, 32 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 6d1e304943a3..c761fb1abfb6 100644
--- a/Makefile
+++ b/Makefile
@@ -671,7 +671,7 @@ endif
 
 ifdef CONFIG_DEBUG_INFO
 KBUILD_CFLAGS   += -g
-KBUILD_AFLAGS   += -Wa,--gdwarf-2
+KBUILD_AFLAGS   += -Wa,-gdwarf-2
 endif
 
 ifdef CONFIG_DEBUG_INFO_REDUCED
diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
index c81adc08b3fb..a3c24cd5b7c8 100644
--- a/arch/arm/include/asm/glue-cache.h
+++ b/arch/arm/include/asm/glue-cache.h
@@ -130,22 +130,22 @@
 #endif
 
 #ifndef __ASSEMBLER__
-extern inline void nop_flush_icache_all(void) { }
-extern inline void nop_flush_kern_cache_all(void) { }
-extern inline void nop_flush_kern_cache_louis(void) { }
-extern inline void nop_flush_user_cache_all(void) { }
-extern inline void nop_flush_user_cache_range(unsigned long a,
+static inline void nop_flush_icache_all(void) { }
+static inline void nop_flush_kern_cache_all(void) { }
+static inline void nop_flush_kern_cache_louis(void) { }
+static inline void nop_flush_user_cache_all(void) { }
+static inline void nop_flush_user_cache_range(unsigned long a,
                 unsigned long b, unsigned int c) { }
 
-extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
-extern inline int nop_coherent_user_range(unsigned long a,
+static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
+static inline int nop_coherent_user_range(unsigned long a,
                 unsigned long b) { return 0; }
-extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
+static inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
 
-extern inline void nop_dma_flush_range(const void *a, const void *b) { }
+static inline void nop_dma_flush_range(const void *a, const void *b) { }
 
-extern inline void nop_dma_map_area(const void *s, size_t l, int f) { }
-extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
+static inline void nop_dma_map_area(const void *s, size_t l, int f) { }
+static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
 #endif
 
 #ifndef MULTI_CACHE
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index cb791ac6a003..e67682f02cb2 100644
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -31,7 +31,7 @@
 #warning Your compiler does not have EABI support.
 #warning    ARM unwind is known to compile only with EABI compilers.
 #warning    Change compiler or disable ARM_UNWIND option.
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)
+#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 2) && !defined(__clang__)
 #warning Your compiler is too buggy; it is known to not compile ARM unwind support.
 #warning    Change compiler or disable ARM_UNWIND option.
 #endif
diff --git a/crypto/shash.c b/crypto/shash.c
index 929058a68561..47c713954bf3 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -67,7 +67,8 @@ EXPORT_SYMBOL_GPL(crypto_shash_setkey);
 static inline unsigned int shash_align_buffer_size(unsigned len,
                                                    unsigned long mask)
 {
-        return len + (mask & ~(__alignof__(u8 __attribute__ ((aligned))) - 1));
+        typedef u8 __attribute__ ((aligned)) u8_aligned;
+        return len + (mask & ~(__alignof__(u8_aligned) - 1));
 }
 
 static int shash_update_unaligned(struct shash_desc *desc, const u8 *data,
diff --git a/net/netfilter/xt_repldata.h b/net/netfilter/xt_repldata.h
index 6efe4e5a81c6..8fd324116e6f 100644
--- a/net/netfilter/xt_repldata.h
+++ b/net/netfilter/xt_repldata.h
@@ -5,23 +5,35 @@
  * they serve as the hanging-off data accessed through repl.data[].
  */
 
+/* tbl has the following structure equivalent, but is C99 compliant:
+ * struct {
+ *      struct type##_replace repl;
+ *      struct type##_standard entries[nhooks];
+ *      struct type##_error term;
+ * } *tbl;
+ */
+
 #define xt_alloc_initial_table(type, typ2) ({ \
         unsigned int hook_mask = info->valid_hooks; \
         unsigned int nhooks = hweight32(hook_mask); \
         unsigned int bytes = 0, hooknum = 0, i = 0; \
         struct { \
                 struct type##_replace repl; \
-                struct type##_standard entries[nhooks]; \
-                struct type##_error term; \
-        } *tbl = kzalloc(sizeof(*tbl), GFP_KERNEL); \
+                struct type##_standard entries[]; \
+        } *tbl; \
+        struct type##_error *term; \
+        size_t term_offset = (offsetof(typeof(*tbl), entries[nhooks]) + \
+                __alignof__(*term) - 1) & ~(__alignof__(*term) - 1); \
+        tbl = kzalloc(term_offset + sizeof(*term), GFP_KERNEL); \
         if (tbl == NULL) \
                 return NULL; \
+        term = (struct type##_error *)&(((char *)tbl)[term_offset]); \
         strncpy(tbl->repl.name, info->name, sizeof(tbl->repl.name)); \
-        tbl->term = (struct type##_error)typ2##_ERROR_INIT;  \
+        *term = (struct type##_error)typ2##_ERROR_INIT;  \
         tbl->repl.valid_hooks = hook_mask; \
         tbl->repl.num_entries = nhooks + 1; \
         tbl->repl.size = nhooks * sizeof(struct type##_standard) + \
-                         sizeof(struct type##_error); \
+                         sizeof(struct type##_error); \
         for (; hook_mask != 0; hook_mask >>= 1, ++hooknum) { \
                 if (!(hook_mask & 1)) \
                         continue; \