Skip to contentSkip to conversation

s390: Fix a build error

PATCH New Fengguang Wu 3 participants 3 messages Mar 7, 2013 – Mar 11, 2013 1 message not in the archive s390

lore
Share & tools
lore
#2 lore raw

PATCH RESEND 1/1 s390: Fix a build error

In reply to a message not in the archive

Commit 877c685607925238e302cd3aa38788dca6c1b226
("perf: Remove include of cgroup.h from perf_event.h") caused this:

In file included from arch/s390/include/asm/perf_event.h:9:0,
from include/linux/perf_event.h:24, from kernel/events/ring_buffer.c:12:
arch/s390/include/asm/cpu_mf.h: In function 'qctri':
arch/s390/include/asm/cpu_mf.h:61:12: error: 'EINVAL' undeclared (first use in this function)

---

CC LKML, and add tested-by tag.

---
 arch/s390/include/asm/cpu_mf.h | 1 +
 1 file changed, 1 insertion(+)
arch/s390/include/asm/cpu_mf.h +1 -0
index f1eddd1..c879fad 100644
@@ -12,6 +12,7 @@
 #ifndef _ASM_S390_CPU_MF_H
 #define _ASM_S390_CPU_MF_H
 
+#include <linux/errno.h>
 #include <asm/facility.h>
 
 #define CPU_MF_INT_SF_IAE	(1 << 31)	/* invalid entry address */
Signature · 1 line
1.8.0.2
#3 lore raw

[tip:perf/urgent] s390: Fix a header dependencies related build error

s390: Fix a header dependencies related build error
Commit-ID:  cb16b91a449afd01b85ec4e59f30449d11c4acd7
Gitweb:     http://git.kernel.org/tip/cb16b91a449afd01b85ec4e59f30449d11c4acd7
Author:     Li Zefan <[email protected]>
AuthorDate: Thu, 7 Mar 2013 17:35:53 +0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 11 Mar 2013 10:43:35 +0100

s390: Fix a header dependencies related build error

Commit 877c685607925238e302cd3aa38788dca6c1b226 ("perf: Remove include of cgroup.h from perf_event.h") caused this build failure if PERF_EVENTS is enabled:

In file included from arch/s390/include/asm/perf_event.h:9:0,
from include/linux/perf_event.h:24,
from kernel/events/ring_buffer.c:12:
arch/s390/include/asm/cpu_mf.h: In function 'qctri':
arch/s390/include/asm/cpu_mf.h:61:12: error: 'EINVAL' undeclared (first use in this function)

cpu_mf.h had an implicit errno.h dependency, which was added indirectly via cgroups.h but not anymore. Add it explicitly.

---
 arch/s390/include/asm/cpu_mf.h | 1 +
 1 file changed, 1 insertion(+)
arch/s390/include/asm/cpu_mf.h +1 -0
index 35f0020..c7c9bf6 100644
@@ -12,6 +12,7 @@
 #ifndef _ASM_S390_CPU_MF_H
 #define _ASM_S390_CPU_MF_H
 
+#include <linux/errno.h>
 #include <asm/facility.h>
 
 #define CPU_MF_INT_SF_IAE	(1 << 31)	/* invalid entry address */