blob: a60f713615f460c84224e4f7d90fdd61d8707cf0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From 3a5e4429120f117046da3e32506f04bf0705d4d1 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 29 Dec 2008 07:39:14 -0500
Subject: [PATCH 6/9] HACK: asm/*: pull in C library headers
Pull in the libc versions of these headers so that the proper
userspace defines/typedefs are utilized.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/asm-generic/fcntl.h | 5 +++++
include/asm-generic/siginfo.h | 5 ++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index 495dc8a..43a9f8b 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -1,6 +1,11 @@
#ifndef _ASM_GENERIC_FCNTL_H
#define _ASM_GENERIC_FCNTL_H
+/* Pull in fcntl structs from the libc #244470 */
+#include <fcntl.h>
+#define HAVE_ARCH_STRUCT_FLOCK
+#define HAVE_ARCH_STRUCT_FLOCK64
+
#include <linux/types.h>
/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 942d30b..cd9ed99 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -1,6 +1,10 @@
#ifndef _ASM_GENERIC_SIGINFO_H
#define _ASM_GENERIC_SIGINFO_H
+#ifndef __KERNEL__
+# include <signal.h>
+#else
+
#include <linux/compiler.h>
#include <linux/types.h>
@@ -275,7 +279,6 @@ typedef struct sigevent {
#define sigev_notify_attributes _sigev_un._sigev_thread._attribute
#define sigev_notify_thread_id _sigev_un._tid
-#ifdef __KERNEL__
struct siginfo;
void do_schedule_next_timer(struct siginfo *info);
--
1.6.6.1
|
GitWeb
