Skip to contentSkip to conversation

c6x: Include init.h in asm/cache.h

PATCH In review Guenter Roeck 2 participants 3 messages Feb 7, 2014 – Feb 15, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 c6x: Include init.h in asm/cache.h

arch/c6x/include/asm/cache.h uses __init and thus needs to include init.h. This fixes the following c6x build error.

arch/c6x/include/asm/cache.h:63:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'c6x_cache_init'
extern void __init c6x_cache_init(void);

Problem was inadvertendly introduced with commit c28aa1f (printk/cache: mark printk_once test variable __read_mostly).

---
 arch/c6x/include/asm/cache.h |    1 +
 1 file changed, 1 insertion(+)
arch/c6x/include/asm/cache.h +1 -0
index 09c5a0f..86648c0 100644
@@ -12,6 +12,7 @@
 #define _ASM_C6X_CACHE_H
 
 #include <linux/irqflags.h>
+#include <linux/init.h>
 
 /*
  * Cache line size
Signature · 1 line
1.7.9.7
#1 lore raw
Quoted 22 lines · Guenter Roeck

arch/c6x/include/asm/cache.h uses __init and thus needs to include init.h. This fixes the following c6x build error.

arch/c6x/include/asm/cache.h:63:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'c6x_cache_init'
extern void __init c6x_cache_init(void);

Problem was inadvertendly introduced with commit c28aa1f (printk/cache: mark printk_once test variable __read_mostly).

---
  arch/c6x/include/asm/cache.h |    1 +
  1 file changed, 1 insertion(+)
arch/c6x/include/asm/cache.h +0 -0
index 09c5a0f..86648c0 100644

arch/c6x/include/asm/cache.h line 18

Quoted 7 lines
arch/c6x/include/asm/cache.h +1 -0
@@ -12,6 +12,7 @@
  #define _ASM_C6X_CACHE_H
 
  #include <linux/irqflags.h>
+#include <linux/init.h>
 
  /*
   * Cache line size

ping ... c6x builds still fail in mainline due to this problem. Anyone interested in a fix ?

Guenter

#2 lore raw
Quoted 27 lines · Guenter Roeck
Quoted 26 lines · Guenter Roeck

arch/c6x/include/asm/cache.h uses __init and thus needs to include init.h. This fixes the following c6x build error.

arch/c6x/include/asm/cache.h:63:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'c6x_cache_init'
extern void __init c6x_cache_init(void);

Problem was inadvertendly introduced with commit c28aa1f (printk/cache: mark printk_once test variable __read_mostly).

---
  arch/c6x/include/asm/cache.h |    1 +
  1 file changed, 1 insertion(+)
arch/c6x/include/asm/cache.h +1 -0
index 09c5a0f..86648c0 100644
@@ -12,6 +12,7 @@
  #define _ASM_C6X_CACHE_H
 
  #include <linux/irqflags.h>
+#include <linux/init.h>
 
Quoted 7 lines

arch/c6x/include/asm/cache.h line 18

Quoted 3 lines
arch/c6x/include/asm/cache.h +0 -0
  /*
   * Cache line size

ping ... c6x builds still fail in mainline due to this problem. Anyone interested in a fix ?

Yes, I'm interested. A fix has been in linux-next for a while but I haven't pushed it to Linus yet. Will do that this week.