[patch] Initial header patch

sysklogd-2.6headers-initial.patch (text/plain), 7.42 KB, created by Tim Yamin (RETIRED) on 2004-01-19 12:46:21 UTC

--- sysklogd-1.4.1/ksym_mod.c	2000-09-12 22:15:28.000000000 +0100
+++ sysklogd-1.4.1-plasmaroo26fix/ksym_mod.c	2004-01-19 20:15:16.000000000 +0000
@@ -80,9 +80,30 @@
  *	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>
@@ -93,6 +114,7 @@
 #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));
@@ -137,8 +159,10 @@
 	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;
diff -ur /usr/include/asm/mpspec.h asm/mpspec.h
--- /usr/include/asm/mpspec.h	2004-01-19 20:18:36.000000000 +0000
+++ asm/mpspec.h	2004-01-19 20:01:11.000000000 +0000
@@ -3,7 +3,7 @@
 
 #include <linux/cpumask.h>
 #include <asm/mpspec_def.h>
-#include <mach_mpspec.h>
+#include <asm/mach-generic/mach_mpspec.h>
 
 extern int mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_bus_id_to_node [MAX_MP_BUSSES];
diff -ur /usr/include/asm/processor.h asm/processor.h
--- /usr/include/asm/processor.h	2004-01-19 20:18:36.000000000 +0000
+++ asm/processor.h	2004-01-19 20:01:11.000000000 +0000
@@ -8,7 +8,9 @@
 #define __ASM_I386_PROCESSOR_H
 
 #include <asm/vm86.h>
+#ifdef __KERNEL__
 #include <asm/math_emu.h>
+#endif
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/types.h>
diff -ur /usr/include/asm/semaphore.h asm/semaphore.h
--- /usr/include/asm/semaphore.h	2004-01-19 20:18:36.000000000 +0000
+++ asm/semaphore.h	2004-01-19 20:01:11.000000000 +0000
@@ -3,8 +3,6 @@
 
 #include <linux/linkage.h>
 
-#ifdef __KERNEL__
-
 /*
  * SMP- and interrupt-safe semaphores..
  *
@@ -214,4 +212,3 @@
 }
 
 #endif
-#endif
diff -ur /usr/include/asm/signal.h asm/signal.h
--- /usr/include/asm/signal.h	2004-01-19 20:18:36.000000000 +0000
+++ asm/signal.h	2004-01-19 20:01:11.000000000 +0000
@@ -26,7 +26,9 @@
 /* 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__ */
 
@@ -155,6 +157,7 @@
 #else
 /* Here we must cater to libcs that poke about in kernel headers.  */
 
+#ifndef _SIGNAL_H
 struct sigaction {
 	union {
 	  __sighandler_t _sa_handler;
@@ -164,17 +167,20 @@
 	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>
diff -ur /usr/include/asm/smp.h asm/smp.h
--- /usr/include/asm/smp.h	2004-01-19 20:18:36.000000000 +0000
+++ asm/smp.h	2004-01-19 20:01:11.000000000 +0000
@@ -70,7 +70,7 @@
 #ifdef APIC_DEFINITION
 extern int hard_smp_processor_id(void);
 #else
-#include <mach_apicdef.h>
+#include <asm/mach-generic/mach_apicdef.h>
 static inline int hard_smp_processor_id(void)
 {
 	/* we don't want to mark this access volatile - bad code generation */
diff -ur /usr/include/linux/jiffies.h linux/jiffies.h
--- /usr/include/linux/jiffies.h	2004-01-19 20:18:36.000000000 +0000
+++ linux/jiffies.h	2004-01-19 20:01:18.000000000 +0000
@@ -2,7 +2,7 @@
 #define _LINUX_JIFFIES_H
 
 #include <linux/kernel.h>
-#include <linux/types.h>
+#include <asm/types.h>
 #include <linux/spinlock.h>
 #include <linux/seqlock.h>
 #include <asm/system.h>
@@ -13,11 +13,11 @@
  * without holding read_lock_irq(&xtime_lock).
  * get_jiffies_64() will do this for you as appropriate.
  */
-extern u64 jiffies_64;
+extern unsigned long long jiffies_64;
 extern unsigned long volatile jiffies;
 
 #if (BITS_PER_LONG < 64)
-u64 get_jiffies_64(void);
+unsigned long long get_jiffies_64(void);
 #else
 static inline u64 get_jiffies_64(void)
 {
diff -ur /usr/include/linux/time.h linux/time.h
--- /usr/include/linux/time.h	2004-01-19 20:18:36.000000000 +0000
+++ linux/time.h	2004-01-19 20:01:18.000000000 +0000
@@ -281,6 +281,8 @@
  * machines were long is 32-bit! (However, as time_t is signed, we
  * will already get problems at other places on 2038-01-19 03:14:08)
  */
+
+#ifndef _TIME_H
 static inline unsigned long
 mktime (unsigned int year, unsigned int mon,
 	unsigned int day, unsigned int hour,
@@ -298,6 +300,7 @@
 	  )*60 + min /* now have minutes */
 	)*60 + sec; /* finally seconds */
 }
+#endif
 
 extern struct timespec xtime;
 extern struct timespec wall_to_monotonic;
diff -ur /usr/include/linux/types.h linux/types.h
--- /usr/include/linux/types.h	2004-01-19 20:18:36.000000000 +0000
+++ linux/types.h	2004-01-19 20:01:18.000000000 +0000
@@ -19,12 +19,24 @@
 
 typedef __u32 __kernel_dev_t;
 
+#ifndef _SYS_SELECT_H
 typedef __kernel_fd_set		fd_set;
+#endif
+#ifndef __dev_t_defined
 typedef __kernel_dev_t		dev_t;
+#endif
+#ifndef __ino_t_defined
 typedef __kernel_ino_t		ino_t;
+#endif
+#ifndef __mode_t_defined
 typedef __kernel_mode_t		mode_t;
+#endif
+#ifndef __nlink_t_defined
 typedef __kernel_nlink_t	nlink_t;
+#endif
+#ifndef __off_t_defined
 typedef __kernel_off_t		off_t;
+#endif
 typedef __kernel_pid_t		pid_t;
 typedef __kernel_daddr_t	daddr_t;
 typedef __kernel_key_t		key_t;
@@ -34,7 +46,9 @@
 
 #ifdef __KERNEL__
 typedef __kernel_uid32_t	uid_t;
+#define __uid_t_defined
 typedef __kernel_gid32_t	gid_t;
+#define __gid_t_defined
 typedef __kernel_uid16_t        uid16_t;
 typedef __kernel_gid16_t        gid16_t;
 
@@ -49,7 +63,9 @@
  */
 #else
 typedef __kernel_uid_t		uid_t;
+#define __uid_t_defined
 typedef __kernel_gid_t		gid_t;
+#define __gid_t_defined
 #endif /* __KERNEL__ */
 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
diff -ur /usr/include/linux/version.h linux/version.h
--- /usr/include/linux/version.h	2004-01-19 20:18:36.000000000 +0000
+++ linux/version.h	2004-01-19 20:15:51.000000000 +0000
@@ -1,3 +1,4 @@
 #define UTS_RELEASE "2.6.0"
 #define LINUX_VERSION_CODE 132608
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#define GENTOO_26_CODE 1
diff -ur /usr/include/asm-generic/siginfo.h asm-generic/siginfo.h
--- /usr/include/asm-generic/siginfo.h	2004-01-19 20:24:25.000000000 +0000
+++ asm-generic/siginfo.h	2004-01-19 20:25:33.000000000 +0000
@@ -4,10 +4,12 @@
 #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
@@ -31,7 +33,7 @@
 #endif
 
 #ifndef HAVE_ARCH_SIGINFO_T
-
+#ifndef _SIGNAL_H
 typedef struct siginfo {
 	int si_signo;
 	int si_errno;
@@ -86,7 +88,7 @@
 		} _sigpoll;
 	} _sifields;
 } siginfo_t;
-
+#endif
 #endif
 
 /*
@@ -238,7 +240,7 @@
 #endif
 
 #ifndef HAVE_ARCH_SIGEVENT_T
-
+#ifndef _SIGNAL_H
 typedef struct sigevent {
 	sigval_t sigev_value;
 	int sigev_signo;
@@ -253,7 +255,7 @@
 		} _sigev_thread;
 	} _sigev_un;
 } sigevent_t;
-
+#endif
 #endif
 
 #define sigev_notify_function	_sigev_un._sigev_thread._function