Author: qboosh Date: Tue Apr 3 14:35:57 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from KERNEL branch
---- Files affected:
SOURCES:
linux-libc-headers-wrr.patch (1.5 -> 1.6) ,
linux-libc-headers-fbsplash.patch (1.3 -> 1.4) , linux-libc-headers-imq.patch
(1.1 -> 1.2) , linux-libc-headers-endian.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/linux-libc-headers-wrr.patch
diff -u SOURCES/linux-libc-headers-wrr.patch:1.5
SOURCES/linux-libc-headers-wrr.patch:1.6
--- SOURCES/linux-libc-headers-wrr.patch:1.5 Sun Nov 7 22:30:19 2004
+++ SOURCES/linux-libc-headers-wrr.patch Tue Apr 3 16:35:52 2007
@@ -1,126 +1,113 @@
---- linux-libc-headers-2.6.9.1/include/linux/pkt_sched.h.orig 2004-11-07
21:03:14.924678496 +0100
-+++ linux-libc-headers-2.6.9.1/include/linux/pkt_sched.h 2004-11-07
21:04:53.666667432 +0100
-@@ -2,7 +2,8 @@
- #define __LINUX_PKT_SCHED_H
+diff -urN linux-2.6.20.orig/include/linux/pkt_sched.h
linux-2.6.20/include/linux/pkt_sched.h
+--- linux-2.6.20.orig/include/linux/pkt_sched.h 2007-02-04
19:44:54.000000000 +0100
++++ linux-2.6.20/include/linux/pkt_sched.h 2007-02-09 09:38:50.000000000
+0100
+@@ -23,6 +23,11 @@
- #include <asm/types.h>
--
+ #define TC_PRIO_MAX 15
+
++#ifndef __KERNEL__
+#include <sys/time.h>
++#endif
+#include <linux/if_ether.h>
-
- /* Logical priority bands not depending on specific packet scheduler.
- Every scheduler will map them to real traffic classes, if it has
-@@ -444,4 +445,113 @@
++
+ /* Generic queue statistics, available for all the elements.
+ Particular schedulers may have also their private records.
+ */
+@@ -466,4 +468,97 @@
#define NETEM_DIST_SCALE 8192
++
+/* WRR section */
+
-+// A sub weight and of a class
-+// All numbers are represented as parts of (2^64-1).
++/*
++ * A sub weight and of a class
++ * All numbers are represented as parts of (2^64-1).
++ */
+struct tc_wrr_class_weight {
-+ __u64 val; // Current value (0 is not valid)
-+ __u64 decr; // Value pr bytes (2^64-1 is not valid)
-+ __u64 incr; // Value pr seconds (2^64-1 is not valid)
-+ __u64 min; // Minimal value (0 is not valid)
-+ __u64 max; // Minimal value (0 is not valid)
-+
-+ // The time where the above information was correct:
-+ time_t tim;
++ __u64 val; // Current value (0 is not valid)
++ __u64 decr; // Value pr bytes (2^64-1 is not valid)
++ __u64 incr; // Value pr seconds (2^64-1 is not valid)
++ __u64 min; // Minimal value (0 is not valid)
++ __u64 max; // Minimal value (0 is not valid)
++ time_t tim; // The time where the above information was correct
+};
+
-+// Pakcet send when modifying a class:
++/* Packet send when modifying a class */
+struct tc_wrr_class_modf {
-+ // Not-valid values are ignored.
-+ struct tc_wrr_class_weight weight1;
-+ struct tc_wrr_class_weight weight2;
++ /* Not-valid values are ignored */
++ struct tc_wrr_class_weight weight1;
++ struct tc_wrr_class_weight weight2;
+};
+
-+// Packet returned when quering a class:
++/* Packet returned when quering a class */
+struct tc_wrr_class_stats {
-+ char used; // If this is false the information below is invalid
-+
-+ struct tc_wrr_class_modf class_modf;
-+
-+ unsigned char addr[ETH_ALEN];
-+ char usemac; // True if addr is a MAC address, else it is an IP address
-+ // (this value is only for convience, it is always the same
-+ // value as in the qdisc)
-+ int heappos; // Current heap position or 0 if not in heap
-+ __u64 penal_ls; // Penalty value in heap (ls)
-+ __u64 penal_ms; // Penalty value in heap (ms)
++ char used; /* If this is false the information
below is invalid */
++ struct tc_wrr_class_modf class_modf;
++ unsigned char addr[ETH_ALEN];
++ char usemac; /* True if addr is a MAC address, else
it is an IP address
++ (this value is only for convience,
it is always the same
++ value as in the qdisc) */
++ int heappos; /* Current heap position or 0 if not in
heap */
++ __u64 penal_ls; /* Penalty value in heap (ls) */
++ __u64 penal_ms; /* Penalty value in heap (ms) */
+};
+
-+// Qdisc-wide penalty information (boolean values - 2 not valid)
++/* Qdisc-wide penalty information (boolean values - 2 not valid) */
+struct tc_wrr_qdisc_weight {
-+ char weight_mode; // 0=No automatic change to weight
-+ // 1=Decrease normally
-+ // 2=Also multiply with number of machines
-+ // 3=Instead multiply with priority divided
-+ // with priority of the other.
-+ // -1=no change
++ signed char weight_mode; /* 0=No automatic change to weight
++ 1=Decrease normally
++ 2=Also multiply with number of
machines
++ 3=Instead multiply with priority
divided
++ with priority of the other.
++ -1=no change */
+};
+
-+// Packet send when modifing a qdisc:
++/* Packet send when modifing a qdisc */
+struct tc_wrr_qdisc_modf {
-+ // Not-valid values are ignored:
-+ struct tc_wrr_qdisc_weight weight1;
-+ struct tc_wrr_qdisc_weight weight2;
++ /* Not-valid values are ignored */
++ struct tc_wrr_qdisc_weight weight1;
++ struct tc_wrr_qdisc_weight weight2;
+};
+
-+// Packet send when creating a qdisc:
++/* Packet send when creating a qdisc */
+struct tc_wrr_qdisc_crt {
-+ struct tc_wrr_qdisc_modf qdisc_modf;
-+
-+ char srcaddr; // 1=lookup source, 0=lookup destination
-+ char usemac; // 1=Classify on MAC addresses, 0=classify on IP
-+ char usemasq; // 1=Classify based on masqgrading - only valid
-+ // if usemac is zero
-+ int bands_max; // Maximal number of bands (i.e.: classes)
-+ int proxy_maxconn; // If differnt from 0 then we support proxy remapping
-+ // of packets. And this is the number of maximal
-+ // concurrent proxy connections.
++ struct tc_wrr_qdisc_modf qdisc_modf;
++ char srcaddr; /* 1=lookup source, 0=lookup destination */
++ char usemac; /* 1=Classify on MAC addresses, 0=classify on
IP */
++ char usemasq; /* 1=Classify based on masqgrading - only valid
++ if usemac is zero */
++ int bands_max; /* Maximal number of bands (i.e.: classes) */
++ int proxy_maxconn; /* If differnt from 0 then we support proxy
remapping
++ of packets. And this is the number of maximal
++ concurrent proxy connections. */
+};
+
-+// Packet returned when quering a qdisc:
++/* Packet returned when quering a qdisc */
+struct tc_wrr_qdisc_stats {
-+ struct tc_wrr_qdisc_crt qdisc_crt;
-+ int proxy_curconn;
-+ int nodes_in_heap; // Current number of bands wanting to send something
-+ int bands_cur; // Current number of bands used (i.e.: MAC/IP addresses
seen)
-+ int bands_reused; // Number of times this band has been reused.
-+ int packets_requed; // Number of times packets have been requeued.
-+ __u64 priosum; // Sum of priorities in heap where 1 is 2^32
++ struct tc_wrr_qdisc_crt qdisc_crt;
++ int proxy_curconn;
++ int nodes_in_heap; /* Current number of bands wanting to send
something */
++ int bands_cur; /* Current number of bands used (i.e.: MAC/IP
addresses seen) */
++ int bands_reused; /* Number of times this band has been reused. */
++ int packets_requed; /* Number of times packets have been requeued.
*/
++ __u64 priosum; /* Sum of priorities in heap where 1 is 2^32 */
+};
+
+struct tc_wrr_qdisc_modf_std {
-+ // This indicates which of the tc_wrr_qdisc_modf structers this is:
-+ char proxy; // 0=This struct
-+
-+ // Should we also change a class?
-+ char change_class;
-+
-+ // Only valid if change_class is false
-+ struct tc_wrr_qdisc_modf qdisc_modf;
-+
-+ // Only valid if change_class is true:
-+ unsigned char addr[ETH_ALEN]; // Class to change (non-used bytes should be
0)
-+ struct tc_wrr_class_modf class_modf; // The change
++ char proxy; /* This indicates which of the
tc_wrr_qdisc_modf structers this is. 0=This struct */
++ char change_class; /* Should we also change a class? */
++ struct tc_wrr_qdisc_modf qdisc_modf; /* Only valid if change_class is
false */
++ unsigned char addr[ETH_ALEN]; /* Class to change (non-used bytes should
be 0). Valid only of change_class is true */
++ struct tc_wrr_class_modf class_modf; /* The change */
+};
+
-+// Used for proxyrempping:
++/* Used for proxyremapping */
+struct tc_wrr_qdisc_modf_proxy {
-+ // This indicates which of the tc_wrr_qdisc_modf structers this is:
-+ char proxy; // 1=This struct
-+
-+ // This is 1 if the proxyremap information should be reset
-+ char reset;
-+
-+ // changec is the number of elements in changes.
-+ int changec;
-+
-+ // This is an array of type ProxyRemapBlock:
-+ long changes[0];
++ char proxy; /* This indicates which of the
tc_wrr_qdisc_modf structers this is. 1=This struct */
++ char reset; /* This is 1 if the proxyremap information
should be reset */
++ int changec; /* changec is the number of elements in
changes. */
++ long changes[0]; /* This is an array of type ProxyRemapBlock */
+};
+
#endif
================================================================
Index: SOURCES/linux-libc-headers-fbsplash.patch
diff -u SOURCES/linux-libc-headers-fbsplash.patch:1.3
SOURCES/linux-libc-headers-fbsplash.patch:1.4
--- SOURCES/linux-libc-headers-fbsplash.patch:1.3 Tue Aug 2 20:15:49 2005
+++ SOURCES/linux-libc-headers-fbsplash.patch Tue Apr 3 16:35:52 2007
@@ -1,6 +1,8 @@
-diff -uNr linux-libc-headers-2.6.11.0.orig/include/linux/console_splash.h
linux-libc-headers-2.6.11.0/include/linux/console_splash.h
---- linux-libc-headers-2.6.11.0.orig/include/linux/console_splash.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.11.0/include/linux/console_splash.h 2005-03-13
23:23:02.000000000 +0100
+diff --git a/include/linux/console_splash.h b/include/linux/console_splash.h
+new file mode 100644
+index 0000000..c448dd2
+--- /dev/null
++++ b/include/linux/console_splash.h
@@ -0,0 +1,13 @@
+#ifndef _LINUX_CONSOLE_SPLASH_H_
+#define _LINUX_CONSOLE_SPLASH_H_ 1
@@ -15,29 +17,11 @@
+};
+
+#endif
-diff -uNr linux-libc-headers-2.6.11.0.orig/include/linux/console_struct.h
linux-libc-headers-2.6.11.0/include/linux/console_struct.h
---- linux-libc-headers-2.6.11.0.orig/include/linux/console_struct.h
2005-03-13 21:54:02.000000000 +0100
-+++ linux-libc-headers-2.6.11.0/include/linux/console_struct.h 2005-03-13
23:23:02.000000000 +0100
-@@ -12,6 +12,7 @@
- struct vt_struct;
-
- #define NPAR 16
-+#include <linux/console_splash.h>
-
- struct vc_data {
- unsigned short vc_num; /* Console number */
-@@ -95,6 +96,7 @@
- struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg
console for this display */
- unsigned long vc_uni_pagedir;
- unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir
variable for this console */
-+ struct vc_splash vc_splash;
- /* additional information is in vt_kern.h */
- };
-
-diff -uNr linux-libc-headers-2.6.11.0.orig/include/linux/fb.h
linux-libc-headers-2.6.11.0/include/linux/fb.h
---- linux-libc-headers-2.6.11.0.orig/include/linux/fb.h 2005-01-08
15:03:32.000000000 +0100
-+++ linux-libc-headers-2.6.11.0/include/linux/fb.h 2005-03-13
23:33:46.000000000 +0100
-@@ -8,6 +8,13 @@
+diff --git a/include/linux/fb.h b/include/linux/fb.h
+index 64177ec..dc99c4f 100644
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
+@@ -9,6 +9,13 @@
#define FB_MAJOR 29
#define FB_MAX 32 /* sufficient for now */
@@ -51,19 +35,23 @@
/* ioctls
0x46 is 'F'
*/
#define FBIOGET_VSCREENINFO 0x4600
-@@ -32,6 +39,15 @@
+@@ -36,7 +43,15 @@
+ #define FBIOGET_HWCINFO 0x4616
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
-
+#define FBIOSPLASH_SETCFG _IOWR('F', 0x19, struct fb_splash_iowrapper)
+#define FBIOSPLASH_GETCFG _IOR('F', 0x1A, struct fb_splash_iowrapper)
+#define FBIOSPLASH_SETSTATE _IOWR('F', 0x1B, struct fb_splash_iowrapper)
+#define FBIOSPLASH_GETSTATE _IOR('F', 0x1C, struct fb_splash_iowrapper)
+#define FBIOSPLASH_SETPIC _IOWR('F', 0x1D, struct fb_splash_iowrapper)
-+
+
+#define FB_SPLASH_THEME_LEN 128 /* Maximum lenght of a theme
name */
+#define FB_SPLASH_IO_ORIG_KERNEL 0 /* Kernel ioctl origin */
+#define FB_SPLASH_IO_ORIG_USER 1 /* User ioctl origin */
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved
planes */
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -112,0 +112,1 @@
++header-y += console_splash.h
================================================================
Index: SOURCES/linux-libc-headers-imq.patch
diff -u SOURCES/linux-libc-headers-imq.patch:1.1
SOURCES/linux-libc-headers-imq.patch:1.2
--- SOURCES/linux-libc-headers-imq.patch:1.1 Thu Aug 4 21:32:50 2005
+++ SOURCES/linux-libc-headers-imq.patch Tue Apr 3 16:35:52 2007
@@ -1,17 +1,5 @@
---- a/include/linux/imq.h 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/linux/imq.h 2004-10-19 18:34:52.000000000 +0000
-@@ -0,0 +1,9 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+#define IMQ_MAX_DEVS 16
-+
-+#define IMQ_F_IFMASK 0x7f
-+#define IMQ_F_ENQUEUE 0x80
-+
-+#endif /* _IMQ_H */
---- a/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 00:00:00.000000000
+0000
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h 2004-10-19 18:34:52.000000000
+0000
+--- linux-2.6.17.orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01
00:00:00.000000000 +0000
++++ linux-2.6.17/include/linux/netfilter_ipv4/ipt_IMQ.h 2006-09-06
20:58:51.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -21,8 +9,12 @@
+};
+
+#endif /* _IPT_IMQ_H */
---- a/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 00:00:00.000000000
+0000
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h 2004-10-19 18:34:52.000000000
+0000
+--- linux.orig/include/linux/netfilter_ipv4/Kbuild
++++ linux/include/linux/netfilter_ipv4/Kbuild
+@@ -62,0 +62,1 @@
++header-y += ipt_IMQ.h
+--- linux-2.6.17.orig/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01
00:00:00.000000000 +0000
++++ linux-2.6.17/include/linux/netfilter_ipv6/ip6t_IMQ.h 2006-09-06
20:58:51.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -32,16 +24,7 @@
+};
+
+#endif /* _IP6T_IMQ_H */
---- a/include/linux/skbuff.h 2004-10-18 21:55:36.000000000 +0000
-+++ b/include/linux/skbuff.h 2004-10-19 18:40:20.000000000 +0000
-@@ -261,6 +261,10 @@
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- struct sk_buff *nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ unsigned char imq_flags;
-+ struct nf_info *nf_info;
-+#endif
- #ifdef CONFIG_NETFILTER_DEBUG
- unsigned int nf_debug;
- #endif
+--- linux.orig/include/linux/netfilter_ipv6/Kbuild
++++ linux/include/linux/netfilter_ipv6/Kbuild
+@@ -22,0 +22,1 @@
++header-y += ip6t_IMQ.h
================================================================
Index: SOURCES/linux-libc-headers-endian.patch
diff -u SOURCES/linux-libc-headers-endian.patch:1.2
SOURCES/linux-libc-headers-endian.patch:1.3
--- SOURCES/linux-libc-headers-endian.patch:1.2 Tue Aug 23 19:47:28 2005
+++ SOURCES/linux-libc-headers-endian.patch Tue Apr 3 16:35:52 2007
@@ -1,641 +1,60 @@
-diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h
linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h
---- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h 2005-03-13
21:54:07.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23
22:19:47.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <asm/ptrace.h>
- #include <asm/user.h>
- #include <asm/page.h>
-+#include <endian.h>
-
- /* M32R relocation types */
- #define R_M32R_NONE 0
-@@ -82,9 +83,9 @@
- * These are used to set parameters in the core dumps.
- */
- #define ELF_CLASS ELFCLASS32
--#if defined(__LITTLE_ENDIAN)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define ELF_DATA ELFDATA2LSB
--#elif defined(__BIG_ENDIAN)
-+#elif __BYTE_ORDER == __BIG_ENDIAN
- #define ELF_DATA ELFDATA2MSB
- #else
- #error no endian defined
-diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h
linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h
---- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h 2005-03-25
20:39:05.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23
22:19:47.000000000 +0200
-@@ -5,7 +5,7 @@
-
- /* orig : i386 2.4.18 */
+--- linux-2.6.20/include/linux/aio_abi.h.orig 2007-02-04 19:44:54.000000000
+0100
++++ linux-2.6.20/include/linux/aio_abi.h 2007-04-02 21:27:18.150605175
+0200
+@@ -27,7 +27,11 @@
+ #ifndef __LINUX__AIO_ABI_H
+ #define __LINUX__AIO_ABI_H
--#include <asm/byteorder.h>
-+#include <endian>
-
- struct __old_kernel_stat {
- unsigned short st_dev;
-@@ -67,10 +67,10 @@
- long long st_size;
- unsigned long st_blksize;
-
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- unsigned long __pad4; /* future possible st_blocks high bits
*/
- unsigned long st_blocks; /* Number 512-byte blocks allocated. */
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- unsigned long st_blocks; /* Number 512-byte blocks allocated. */
- unsigned long __pad4; /* future possible st_blocks high bits
*/
- #else
-diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h
linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h
---- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h
2004-10-31 20:54:13.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h
2005-08-23 22:19:47.000000000 +0200
-@@ -16,6 +16,7 @@
- #ifndef __ASSEMBLY__
- #include <asm/system.h>
- #endif
++#ifdef __KERNEL__
+ #include <asm/byteorder.h>
++#else
+#include <endian.h>
++#endif
- /* CS */
- #define JMR3927_ROMCE0 0x1fc00000 /* 4M */
-@@ -148,10 +149,10 @@
- #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned short *)(a)) =
(d) << 8)
- #define jmr3927_ioc_reg_in(a) (((*(volatile unsigned short *)(a)) >>
8) & 0xff)
- #else
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)(a)) = (d))
- #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)(a))
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)((a)^1)) =
(d))
- #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)((a)^1))
- #else
-diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h
linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h
---- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h
2004-10-31 20:54:13.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h
2005-08-23 22:19:47.000000000 +0200
-@@ -67,9 +67,9 @@
- volatile unsigned long csr;
- };
+ typedef unsigned long aio_context_t;
--#include <asm/byteorder.h>
-+#include <endian.h>
-
--#ifdef __BIG_ENDIAN
-+#if __BYTE_ORDER == __BIG_ENDIAN
- #define endian_def_s2(e1,e2) \
- volatile unsigned short e1,e2
- #define endian_def_sb2(e1,e2,e3) \
-diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h
linux-libc-headers-2.6.12.0/include/linux/aio_abi.h
---- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h 2005-07-06
02:17:21.000000000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23
22:19:47.000000000 +0200
-@@ -53,9 +53,9 @@
+@@ -53,6 +57,7 @@
__s64 res2; /* secondary result */
};
--#if defined(__LITTLE_ENDIAN)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
++#ifdef __KERNEL__
+ #if defined(__LITTLE_ENDIAN)
#define PADDED(x,y) x, y
--#elif defined(__BIG_ENDIAN)
-+#elif __BYTE_ORDER == __BIG_ENDIAN
- #define PADDED(x,y) y, x
+ #elif defined(__BIG_ENDIAN)
+@@ -60,6 +65,15 @@
#else
#error edit for your odd byteorder.
-diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h
linux-libc-headers-2.6.12.0/include/linux/cdrom.h
---- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h 2005-01-08
15:03:51.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23
22:19:47.000000000 +0200
-@@ -15,7 +15,7 @@
- #include <endian.h>
- #include <byteswap.h>
-
--#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)
-+#if (__BYTE_ORDER != __LITTLE_ENDIAN) && (__BYTE_ORDER != __BIG_ENDIAN)
- #error "Endian problem - this didn't happen"
- #endif
-
-@@ -699,20 +699,20 @@
- } dvd_authinfo;
-
- struct request_sense {
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 valid : 1;
- __u8 error_code : 7;
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 error_code : 7;
- __u8 valid : 1;
- #endif
- __u8 segment_number;
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 reserved1 : 2;
- __u8 ili : 1;
- __u8 reserved2 : 1;
- __u8 sense_key : 4;
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 sense_key : 4;
- __u8 reserved2 : 1;
- __u8 ili : 1;
-@@ -771,22 +771,22 @@
-
- struct mrw_feature_desc {
- __u16 feature_code;
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 reserved1 : 2;
- __u8 feature_version : 4;
- __u8 persistent : 1;
- __u8 curr : 1;
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 curr : 1;
- __u8 persistent : 1;
- __u8 feature_version : 4;
- __u8 reserved1 : 2;
#endif
- __u8 add_len;
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 reserved2 : 7;
- __u8 write : 1;
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 write : 1;
- __u8 reserved2 : 7;
- #endif
-@@ -798,12 +798,12 @@
- /* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */
- struct rwrt_feature_desc {
- __u16 feature_code;
--#if defined(__BIG_ENDIAN_BITFIELD)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 reserved1 : 2;
- __u8 feature_version : 4;
- __u8 persistent : 1;
- __u8 curr : 1;
--#elif defined(__LITTLE_ENDIAN_BITFIELD)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 curr : 1;
- __u8 persistent : 1;
- __u8 feature_version : 4;
-@@ -813,10 +813,10 @@
- __u32 last_lba;
- __u32 block_size;
- __u16 blocking;
--#if defined(__BIG_ENDIAN_BITFIELD)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 reserved2 : 7;
- __u8 page_present : 1;
--#elif defined(__LITTLE_ENDIAN_BITFIELD)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 page_present : 1;
- __u8 reserved2 : 7;
- #endif
-@@ -825,12 +825,12 @@
-
- typedef struct {
- __u16 disc_information_length;
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 reserved1 : 3;
- __u8 erasable : 1;
- __u8 border_status : 2;
- __u8 disc_status : 2;
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 disc_status : 2;
- __u8 border_status : 2;
- __u8 erasable : 1;
-@@ -840,14 +840,14 @@
- __u8 n_sessions_lsb;
- __u8 first_track_lsb;
- __u8 last_track_lsb;
--#if defined(__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
- __u8 did_v : 1;
- __u8 dbc_v : 1;
- __u8 uru : 1;
- __u8 reserved2 : 2;
- __u8 dbit : 1;
- __u8 mrw_status : 2;
--#elif defined(__LITTLE_ENDIAN)
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
- __u8 mrw_status : 2;
- __u8 dbit : 1;
- __u8 reserved2 : 2;
-@@ -872,7 +872,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-libc-headers-wrr.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/linux-libc-headers-fbsplash.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/linux-libc-headers-imq.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/linux-libc-headers-endian.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
