Attachment #24093 for bug #38357

View | Details | Raw Unified | Return to bug 38357
Collapse All | Expand All




 *	Changed llseek() to lseek64() in order to skip a libc warning.
 */


/* Includes. */

#include <stdlib.h>
#include <time.h>
#include <signal.h>
#include <linux/version.h>

#if GENTOO_26_CODE > 0

	#include <linux/signal.h>
	#include <linux/spinlock.h>

	#define __KERNEL__
	#include <asm/posix_types.h>
	#undef __KERNEL_STRICT_NAMES
	#include <linux/types.h>

	#undef _LINUX_LIST_H
	#include <linux/list.h>
	#include <asm/semaphore.h>
	#undef __KERNEL__

#endif

#include <malloc.h>
#include <unistd.h>
#include <signal.h>

#include <linux/time.h>
#include <linux/module.h>
#else /* __GLIBC__ */

#include <linux/module.h>
extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
extern int get_kernel_syms __P ((struct kernel_sym *__table));

	char *name;
	struct module module;
#if LINUX_VERSION_CODE >= 0x20112
#if LINUX_VERSION_CODE <  132608
	struct module_info module_info;
#endif
#endif
};

static int num_modules = 0;

Lines 3-9 Link Here

(-)/usr/include/asm/mpspec.h (-1 / +1 lines)
3		3
4	#include <linux/cpumask.h>	4	#include <linux/cpumask.h>
5	#include <asm/mpspec_def.h>	5	#include <asm/mpspec_def.h>
6	#include <mach_mpspec.h>	6	#include <asm/mach-generic/mach_mpspec.h>
7		7
8	extern int mp_bus_id_to_type [MAX_MP_BUSSES];	8	extern int mp_bus_id_to_type [MAX_MP_BUSSES];
9	extern int mp_bus_id_to_node [MAX_MP_BUSSES];	9	extern int mp_bus_id_to_node [MAX_MP_BUSSES];

Lines 8-14 Link Here

(-)/usr/include/asm/processor.h (+2 lines)
8	#define __ASM_I386_PROCESSOR_H	8	#define __ASM_I386_PROCESSOR_H
9		9
10	#include <asm/vm86.h>	10	#include <asm/vm86.h>
		11	#ifdef __KERNEL__
11	#include <asm/math_emu.h>	12	#include <asm/math_emu.h>
		13	#endif
12	#include <asm/segment.h>	14	#include <asm/segment.h>
13	#include <asm/page.h>	15	#include <asm/page.h>
14	#include <asm/types.h>	16	#include <asm/types.h>

Lines 3-10 Link Here

(-)/usr/include/asm/semaphore.h (-3 lines)
3		3
4	#include <linux/linkage.h>	4	#include <linux/linkage.h>
5		5
6	#ifdef __KERNEL__
7
8	/*	6	/*
9	* SMP- and interrupt-safe semaphores..	7	* SMP- and interrupt-safe semaphores..
10	*	8	*
Lines 214-217 Link Here
214	}	212	}
215		213
216	#endif	214	#endif
217	#endif




/* Here we must cater to libcs that poke about in kernel headers.  */

#define NSIG		32
#ifndef __sigset_t_defined
typedef unsigned long sigset_t;
#endif

#endif /* __KERNEL__ */


#else
/* Here we must cater to libcs that poke about in kernel headers.  */

#ifndef _SIGNAL_H
struct sigaction {
	union {
	  __sighandler_t _sa_handler;

	unsigned long sa_flags;
	void (*sa_restorer)(void);
};
#endif

#define sa_handler	_u._sa_handler
#define sa_sigaction	_u._sa_sigaction

#endif /* __KERNEL__ */

#ifndef _SIGNAL_H
typedef struct sigaltstack {
	void *ss_sp;
	int ss_flags;
	size_t ss_size;
} stack_t;
#endif

#ifdef __KERNEL__
#include <asm/sigcontext.h>

Lines 70-76 Link Here

(-)/usr/include/asm/smp.h (-1 / +1 lines)
70	#ifdef APIC_DEFINITION	70	#ifdef APIC_DEFINITION
71	extern int hard_smp_processor_id(void);	71	extern int hard_smp_processor_id(void);
72	#else	72	#else
73	#include <mach_apicdef.h>	73	#include <asm/mach-generic/mach_apicdef.h>
74	static inline int hard_smp_processor_id(void)	74	static inline int hard_smp_processor_id(void)
75	{	75	{
76	/* we don't want to mark this access volatile - bad code generation */	76	/* we don't want to mark this access volatile - bad code generation */




#define _LINUX_JIFFIES_H

#include <linux/kernel.h>
#include <asm/types.h>
#include <linux/spinlock.h>
#include <linux/seqlock.h>
#include <asm/system.h>

 * without holding read_lock_irq(&xtime_lock).
 * get_jiffies_64() will do this for you as appropriate.
 */
extern unsigned long long jiffies_64;
extern unsigned long volatile jiffies;

#if (BITS_PER_LONG < 64)
unsigned long long get_jiffies_64(void);
#else
static inline u64 get_jiffies_64(void)
{

Lines 281-286 Link Here

(-)/usr/include/linux/time.h (+3 lines)
281	* machines were long is 32-bit! (However, as time_t is signed, we	281	* machines were long is 32-bit! (However, as time_t is signed, we
282	* will already get problems at other places on 2038-01-19 03:14:08)	282	* will already get problems at other places on 2038-01-19 03:14:08)
283	*/	283	*/
		284
		285	#ifndef _TIME_H
284	static inline unsigned long	286	static inline unsigned long
285	mktime (unsigned int year, unsigned int mon,	287	mktime (unsigned int year, unsigned int mon,
286	unsigned int day, unsigned int hour,	288	unsigned int day, unsigned int hour,
Lines 298-303 Link Here
298	)60 + min / now have minutes */	300	)60 + min / now have minutes */
299	)60 + sec; / finally seconds */	301	)60 + sec; / finally seconds */
300	}	302	}
		303	#endif
301		304
302	extern struct timespec xtime;	305	extern struct timespec xtime;
303	extern struct timespec wall_to_monotonic;	306	extern struct timespec wall_to_monotonic;

Lines 19-30 Link Here

(-)/usr/include/linux/types.h (+16 lines)
19		19
20	typedef __u32 __kernel_dev_t;	20	typedef __u32 __kernel_dev_t;
21		21
		22	#ifndef _SYS_SELECT_H
22	typedef __kernel_fd_set fd_set;	23	typedef __kernel_fd_set fd_set;
		24	#endif
		25	#ifndef __dev_t_defined
23	typedef __kernel_dev_t dev_t;	26	typedef __kernel_dev_t dev_t;
		27	#endif
		28	#ifndef __ino_t_defined
24	typedef __kernel_ino_t ino_t;	29	typedef __kernel_ino_t ino_t;
		30	#endif
		31	#ifndef __mode_t_defined
25	typedef __kernel_mode_t mode_t;	32	typedef __kernel_mode_t mode_t;
		33	#endif
		34	#ifndef __nlink_t_defined
26	typedef __kernel_nlink_t nlink_t;	35	typedef __kernel_nlink_t nlink_t;
		36	#endif
		37	#ifndef __off_t_defined
27	typedef __kernel_off_t off_t;	38	typedef __kernel_off_t off_t;
		39	#endif
28	typedef __kernel_pid_t pid_t;	40	typedef __kernel_pid_t pid_t;
29	typedef __kernel_daddr_t daddr_t;	41	typedef __kernel_daddr_t daddr_t;
30	typedef __kernel_key_t key_t;	42	typedef __kernel_key_t key_t;
Lines 34-40 Link Here
34		46
35	#ifdef __KERNEL__	47	#ifdef __KERNEL__
36	typedef __kernel_uid32_t uid_t;	48	typedef __kernel_uid32_t uid_t;
		49	#define __uid_t_defined
37	typedef __kernel_gid32_t gid_t;	50	typedef __kernel_gid32_t gid_t;
		51	#define __gid_t_defined
38	typedef __kernel_uid16_t uid16_t;	52	typedef __kernel_uid16_t uid16_t;
39	typedef __kernel_gid16_t gid16_t;	53	typedef __kernel_gid16_t gid16_t;
40		54
Lines 49-55 Link Here
49	*/	63	*/
50	#else	64	#else
51	typedef __kernel_uid_t uid_t;	65	typedef __kernel_uid_t uid_t;
		66	#define __uid_t_defined
52	typedef __kernel_gid_t gid_t;	67	typedef __kernel_gid_t gid_t;
		68	#define __gid_t_defined
53	#endif /* __KERNEL__ */	69	#endif /* __KERNEL__ */
54		70
55	#if defined(__GNUC__) && !defined(__STRICT_ANSI__)	71	#if defined(__GNUC__) && !defined(__STRICT_ANSI__)

Lines 1-3 Link Here

(-)/usr/include/linux/version.h (+1 lines)
1	#define UTS_RELEASE "2.6.0"	1	#define UTS_RELEASE "2.6.0"
2	#define LINUX_VERSION_CODE 132608	2	#define LINUX_VERSION_CODE 132608
3	#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))	3	#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
		4	#define GENTOO_26_CODE 1




#include <linux/compiler.h>
#include <linux/types.h>

#ifndef _SIGNAL_H
typedef union sigval {
	int sival_int;
	void *sival_ptr;
} sigval_t;
#endif

/*
 * This is the size (including padding) of the part of the

#endif

#ifndef HAVE_ARCH_SIGINFO_T
#ifndef _SIGNAL_H
typedef struct siginfo {
	int si_signo;
	int si_errno;

		} _sigpoll;
	} _sifields;
} siginfo_t;
#endif
#endif

/*

#endif

#ifndef HAVE_ARCH_SIGEVENT_T
#ifndef _SIGNAL_H
typedef struct sigevent {
	sigval_t sigev_value;
	int sigev_signo;

		} _sigev_thread;
	} _sigev_un;
} sigevent_t;
#endif
#endif

#define sigev_notify_function	_sigev_un._sigev_thread._function

Return to bug 38357

Lines 80-88 Link Here

(-)sysklogd-1.4.1/ksym_mod.c (-1 / +25 lines)
80	* Changed llseek() to lseek64() in order to skip a libc warning.	80	* Changed llseek() to lseek64() in order to skip a libc warning.
81	*/	81	*/
82		82
83
84	/* Includes. */	83	/* Includes. */
		84
85	#include <stdlib.h>	85	#include <stdlib.h>
		86	#include <time.h>
		87	#include <signal.h>
		88	#include <linux/version.h>
		89
		90	#if GENTOO_26_CODE > 0
		91
		92	#include <linux/signal.h>
		93	#include <linux/spinlock.h>
		94
		95	#define __KERNEL__
		96	#include <asm/posix_types.h>
		97	#undef __KERNEL_STRICT_NAMES
		98	#include <linux/types.h>
		99
		100	#undef _LINUX_LIST_H
		101	#include <linux/list.h>
		102	#include <asm/semaphore.h>
		103	#undef __KERNEL__
		104
		105	#endif
		106
86	#include <malloc.h>	107	#include <malloc.h>
87	#include <unistd.h>	108	#include <unistd.h>
88	#include <signal.h>	109	#include <signal.h>
Lines 93-98 Link Here
93	#include <linux/time.h>	114	#include <linux/time.h>
94	#include <linux/module.h>	115	#include <linux/module.h>
95	#else /* __GLIBC__ */	116	#else /* __GLIBC__ */
		117
96	#include <linux/module.h>	118	#include <linux/module.h>
97	extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));	119	extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
98	extern int get_kernel_syms __P ((struct kernel_sym *__table));	120	extern int get_kernel_syms __P ((struct kernel_sym *__table));
Lines 137-144 Link Here
137	char *name;	159	char *name;
138	struct module module;	160	struct module module;
139	#if LINUX_VERSION_CODE >= 0x20112	161	#if LINUX_VERSION_CODE >= 0x20112
		162	#if LINUX_VERSION_CODE < 132608
140	struct module_info module_info;	163	struct module_info module_info;
141	#endif	164	#endif
		165	#endif
142	};	166	};
143		167
144	static int num_modules = 0;	168	static int num_modules = 0;

Lines 26-32 Link Here

(-)/usr/include/asm/signal.h (+6 lines)
26	/* Here we must cater to libcs that poke about in kernel headers. */	26	/* Here we must cater to libcs that poke about in kernel headers. */
27		27
28	#define NSIG 32	28	#define NSIG 32
		29	#ifndef __sigset_t_defined
29	typedef unsigned long sigset_t;	30	typedef unsigned long sigset_t;
		31	#endif
30		32
31	#endif /* __KERNEL__ */	33	#endif /* __KERNEL__ */
32		34
Lines 155-160 Link Here
155	#else	157	#else
156	/* Here we must cater to libcs that poke about in kernel headers. */	158	/* Here we must cater to libcs that poke about in kernel headers. */
157		159
		160	#ifndef _SIGNAL_H
158	struct sigaction {	161	struct sigaction {
159	union {	162	union {
160	__sighandler_t _sa_handler;	163	__sighandler_t _sa_handler;
Lines 164-180 Link Here
164	unsigned long sa_flags;	167	unsigned long sa_flags;
165	void (*sa_restorer)(void);	168	void (*sa_restorer)(void);
166	};	169	};
		170	#endif
167		171
168	#define sa_handler _u._sa_handler	172	#define sa_handler _u._sa_handler
169	#define sa_sigaction _u._sa_sigaction	173	#define sa_sigaction _u._sa_sigaction
170		174
171	#endif /* __KERNEL__ */	175	#endif /* __KERNEL__ */
172		176
		177	#ifndef _SIGNAL_H
173	typedef struct sigaltstack {	178	typedef struct sigaltstack {
174	void *ss_sp;	179	void *ss_sp;
175	int ss_flags;	180	int ss_flags;
176	size_t ss_size;	181	size_t ss_size;
177	} stack_t;	182	} stack_t;
		183	#endif
178		184
179	#ifdef __KERNEL__	185	#ifdef __KERNEL__
180	#include <asm/sigcontext.h>	186	#include <asm/sigcontext.h>

Lines 2-8 Link Here

(-)/usr/include/linux/jiffies.h (-3 / +3 lines)
2	#define _LINUX_JIFFIES_H	2	#define _LINUX_JIFFIES_H
3		3
4	#include <linux/kernel.h>	4	#include <linux/kernel.h>
5	#include <linux/types.h>	5	#include <asm/types.h>
6	#include <linux/spinlock.h>	6	#include <linux/spinlock.h>
7	#include <linux/seqlock.h>	7	#include <linux/seqlock.h>
8	#include <asm/system.h>	8	#include <asm/system.h>
Lines 13-23 Link Here
13	* without holding read_lock_irq(&xtime_lock).	13	* without holding read_lock_irq(&xtime_lock).
14	* get_jiffies_64() will do this for you as appropriate.	14	* get_jiffies_64() will do this for you as appropriate.
15	*/	15	*/
16	extern u64 jiffies_64;	16	extern unsigned long long jiffies_64;
17	extern unsigned long volatile jiffies;	17	extern unsigned long volatile jiffies;
18		18
19	#if (BITS_PER_LONG < 64)	19	#if (BITS_PER_LONG < 64)
20	u64 get_jiffies_64(void);	20	unsigned long long get_jiffies_64(void);
21	#else	21	#else
22	static inline u64 get_jiffies_64(void)	22	static inline u64 get_jiffies_64(void)
23	{	23	{

Lines 4-13 Link Here

(-)/usr/include/asm-generic/siginfo.h (-4 / +6 lines)
4	#include <linux/compiler.h>	4	#include <linux/compiler.h>
5	#include <linux/types.h>	5	#include <linux/types.h>
6		6
		7	#ifndef _SIGNAL_H
7	typedef union sigval {	8	typedef union sigval {
8	int sival_int;	9	int sival_int;
9	void *sival_ptr;	10	void *sival_ptr;
10	} sigval_t;	11	} sigval_t;
		12	#endif
11		13
12	/*	14	/*
13	* This is the size (including padding) of the part of the	15	* This is the size (including padding) of the part of the
Lines 31-37 Link Here
31	#endif	33	#endif
32		34
33	#ifndef HAVE_ARCH_SIGINFO_T	35	#ifndef HAVE_ARCH_SIGINFO_T
34		36	#ifndef _SIGNAL_H
35	typedef struct siginfo {	37	typedef struct siginfo {
36	int si_signo;	38	int si_signo;
37	int si_errno;	39	int si_errno;
Lines 86-92 Link Here
86	} _sigpoll;	88	} _sigpoll;
87	} _sifields;	89	} _sifields;
88	} siginfo_t;	90	} siginfo_t;
89		91	#endif
90	#endif	92	#endif
91		93
92	/*	94	/*
Lines 238-244 Link Here
238	#endif	240	#endif
239		241
240	#ifndef HAVE_ARCH_SIGEVENT_T	242	#ifndef HAVE_ARCH_SIGEVENT_T
241		243	#ifndef _SIGNAL_H
242	typedef struct sigevent {	244	typedef struct sigevent {
243	sigval_t sigev_value;	245	sigval_t sigev_value;
244	int sigev_signo;	246	int sigev_signo;
Lines 253-259 Link Here
253	} _sigev_thread;	255	} _sigev_thread;
254	} _sigev_un;	256	} _sigev_un;
255	} sigevent_t;	257	} sigevent_t;
256		258	#endif
257	#endif	259	#endif
258		260
259	#define sigev_notify_function _sigev_un._sigev_thread._function	261	#define sigev_notify_function _sigev_un._sigev_thread._function