r906 - linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches
Author: gotom
Date: 2005-05-27 14:31:06 +0000 (Fri, 27 May 2005)
New Revision: 906
Removed:
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-mips-asm-and-unistd.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/ioctl-signedness.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/isdn.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fb-compilefix.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msdos-fs.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msqid64_ds-inconsistency.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/nbd.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/s390-asm-byteorder.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/sparc-asm-elf.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/toshiba.patch
Log:
removed in 2.6.12+0rc5-1.
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-mips-asm-and-unistd.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-mips-asm-and-unistd.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-mips-asm-and-unistd.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,43 +0,0 @@
-Fix #234236
-
-Fix mips and mipsel FTBFS. The _syscall5 macro is undefined and thus
-not replaced. Looking at the header files _syscall5 seem only to be
-defined for N32 or 64bit ABI. It should also be defined for O32, and
-include/asm/unistd.h is severly broken WRT. It affects every
-application which includes <linux/unistd.h> and tries to use a syscall
-with more than 4 parameters. The patch is already in the upstream
-repository (www.linux-mips.org).
-
-
---- include/asm-mips/unistd.h.orig 2004-05-11 15:33:41.000000000 +0900
-+++ include/asm-mips/unistd.h 2004-05-11 15:42:18.000000000 +0900
-@@ -917,7 +917,7 @@
- return -1; \
- }
-
--#if (_MIPS_SIM == _MIPS_SIM_ABIN32)
-+#if (_MIPS_SIM == _MIPS_SIM_ABI32)
-
- /*
- * Using those means your brain needs more than an oil change ;-)
-@@ -985,9 +985,9 @@
- return -1; \
- }
-
--#endif /* (_MIPS_SIM == _MIPS_SIM_ABIN32) */
-+#endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */
-
--#if (_MIPS_SIM == _MIPS_SIM_NABIN32) || (_MIPS_SIM == _MIPS_SIM_ABI64)
-+#if (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64)
-
- #define _syscall5(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
- type name (atype a,btype b,ctype c,dtype d,etype e) \
-@@ -1043,7 +1043,7 @@
- return -1; \
- }
-
--#endif /* (_MIPS_SIM == _MIPS_SIM_NABIN32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-+#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-
- #ifdef __KERNEL_SYSCALLS__
-
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/ioctl-signedness.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/ioctl-signedness.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/ioctl-signedness.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,48 +0,0 @@
-diff -ur include/asm-i386/ioctl.h include/asm-i386/ioctl.h
---- include/asm-i386/ioctl.h 2003-11-21 19:14:19.000000000 -0500
-+++ include/asm-i386/ioctl.h 2003-11-21 19:17:13.000000000 -0500
-@@ -53,7 +53,7 @@
- ((size) << _IOC_SIZESHIFT))
-
- /* provoke compile error for invalid uses of size argument */
--extern int __invalid_size_argument_for_IOC;
-+extern unsigned int __invalid_size_argument_for_IOC;
- #define _IOC_TYPECHECK(t) \
- ((sizeof(t) == sizeof(t[1]) && \
- sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
-diff -ur include/asm-parisc/ioctl.h include/asm-parisc/ioctl.h
---- include/asm-parisc/ioctl.h 2003-11-21 19:14:19.000000000 -0500
-+++ include/asm-parisc/ioctl.h 2003-11-21 19:17:13.000000000 -0500
-@@ -45,7 +45,7 @@
- ((size) << _IOC_SIZESHIFT))
-
- /* provoke compile error for invalid uses of size argument */
--extern int __invalid_size_argument_for_IOC;
-+extern unsigned int __invalid_size_argument_for_IOC;
- #define _IOC_TYPECHECK(t) \
- ((sizeof(t) == sizeof(t[1]) && \
- sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
-diff -ur include/asm-ppc/ioctl.h include/asm-ppc/ioctl.h
---- include/asm-ppc/ioctl.h 2003-11-21 19:14:19.000000000 -0500
-+++ include/asm-ppc/ioctl.h 2003-11-21 19:17:13.000000000 -0500
-@@ -38,7 +38,7 @@
- ((size) << _IOC_SIZESHIFT))
-
- /* provoke compile error for invalid uses of size argument */
--extern int __invalid_size_argument_for_IOC;
-+extern unsigned int __invalid_size_argument_for_IOC;
- #define _IOC_TYPECHECK(t) \
- ((sizeof(t) == sizeof(t[1]) && \
- sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
-diff -ur include/asm-ppc64/ioctl.h include/asm-ppc64/ioctl.h
---- include/asm-ppc64/ioctl.h 2003-11-21 19:14:19.000000000 -0500
-+++ include/asm-ppc64/ioctl.h 2003-11-21 19:17:13.000000000 -0500
-@@ -43,7 +43,7 @@
- ((size) << _IOC_SIZESHIFT))
-
- /* provoke compile error for invalid uses of size argument */
--extern int __invalid_size_argument_for_IOC;
-+extern unsigned int __invalid_size_argument_for_IOC;
- #define _IOC_TYPECHECK(t) \
- ((sizeof(t) == sizeof(t[1]) && \
- sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/isdn.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/isdn.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/isdn.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,14 +0,0 @@
-Fixes compilation of <linux/isdn.h> from userland.
-
---- include/linux/isdn.h 2003-10-15 11:15:09.000000000 -0400
-+++ include/linux/isdn.h 2004-01-03 13:22:34.000000000 -0500
-@@ -14,7 +14,9 @@
- #define __ISDN_H__
-
- #include <linux/ioctl.h>
-+#ifdef __KERNEL__
- #include <linux/isdn/fsm.h>
-+#endif
-
- #ifdef CONFIG_COBALT_MICRO_SERVER
- /* Save memory */
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fb-compilefix.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fb-compilefix.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fb-compilefix.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,78 +0,0 @@
-Fix application compilation fix.
-
---- linux-kernel-headers/include/linux/fb.h 2003-11-04 13:26:31.000000000 +0900
-+++ linux-kernel-headers/include/linux/fb.h 2003-11-04 13:24:55.000000000 +0900
-@@ -2,9 +2,7 @@
- #define _LINUX_FB_H
-
- #include <linux/tty.h>
--#include <linux/workqueue.h>
- #include <asm/types.h>
--#include <asm/io.h>
-
- /* Definitions of frame buffers */
-
-@@ -331,23 +330,12 @@
- #define FB_PIXMAP_IO 4 /* memory is iomapped */
- #define FB_PIXMAP_SYNC 256 /* set if GPU can DMA */
-
--struct fb_pixmap {
-- __u8 *addr; /* pointer to memory */
-- __u32 size; /* size of buffer in bytes */
-- __u32 offset; /* current offset to buffer */
-- __u32 buf_align; /* byte alignment of each bitmap */
-- __u32 scan_align; /* alignment per scanline */
-- __u32 flags; /* see FB_PIXMAP_* */
-- /* access methods */
-- void (*outbuf)(u8 *dst, u8 *addr, unsigned int size);
-- u8 (*inbuf) (u8 *addr);
-- spinlock_t lock; /* spinlock */
-- atomic_t count;
--};
- #ifdef __KERNEL__
-
- #include <linux/fs.h>
- #include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <asm/io.h>
-
- struct fb_info;
- struct vm_area_struct;
-@@ -395,6 +382,20 @@
- int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma);
- };
-
-+struct fb_pixmap {
-+ __u8 *addr; /* pointer to memory */
-+ __u32 size; /* size of buffer in bytes */
-+ __u32 offset; /* current offset to buffer */
-+ __u32 buf_align; /* byte alignment of each bitmap */
-+ __u32 scan_align; /* alignment per scanline */
-+ __u32 flags; /* see FB_PIXMAP_* */
-+ /* access methods */
-+ void (*outbuf)(u8 *dst, u8 *addr, unsigned int size);
-+ u8 (*inbuf) (u8 *addr);
-+ spinlock_t lock; /* spinlock */
-+ atomic_t count;
-+};
-+
- struct fb_info {
- int node;
- int flags;
---- linux-kernel-headers/include/linux/videodev.h 2003-11-04 14:04:49.000000000 +0900
-+++ linux-kernel-headers/include/linux/videodev.h 2003-11-04 14:04:04.000000000 +0900
-@@ -3,13 +3,13 @@
-
- #include <linux/types.h>
- #include <linux/version.h>
--#include <linux/device.h>
-
- #define HAVE_V4L2 1
- #include <linux/videodev2.h>
-
- #ifdef __KERNEL__
-
-+#include <linux/device.h>
- #include <linux/poll.h>
- #include <linux/mm.h>
-
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msdos-fs.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msdos-fs.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msdos-fs.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,30 +0,0 @@
-Dosfstools uses this header.
-
---- include/linux/msdos_fs.h.orig 2003-10-15 11:14:03.000000000 -0400
-+++ include/linux/msdos_fs.h 2003-11-23 16:03:14.000000000 -0500
-@@ -4,9 +4,13 @@
- /*
- * The MS-DOS filesystem constants/structures
- */
--#include <linux/buffer_head.h>
- #include <linux/string.h>
- #include <asm/byteorder.h>
-+#include <linux/types.h>
-+
-+#ifdef __KERNEL__
-+#include <linux/buffer_head.h>
-+#endif
-
- struct statfs;
-
-@@ -175,8 +179,8 @@
-
- struct vfat_slot_info {
- int long_slots; /* number of long slots in filename */
-- loff_t longname_offset; /* dir offset for longname start */
-- loff_t i_pos; /* on-disk position of directory entry */
-+ __kernel_loff_t longname_offset; /* dir offset for longname start */
-+ __kernel_loff_t i_pos; /* on-disk position of directory entry */
- };
-
- /* Convert attribute bits and a mask to the UNIX mode. */
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msqid64_ds-inconsistency.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msqid64_ds-inconsistency.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/msqid64_ds-inconsistency.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,47 +0,0 @@
-diff -Nru link/include/asm-mips/msgbuf.h.orig link/include/asm-mips/msgbuf.h
---- link/include/asm-mips/msgbuf.h.orig Wed Feb 19 14:36:47 2003
-+++ link/include/asm-mips/msgbuf.h Tue Oct 7 17:55:47 2003
-@@ -1,23 +1,41 @@
- #ifndef _ASM_MSGBUF_H
- #define _ASM_MSGBUF_H
-
-+#include <linux/config.h>
-+
- /*
-- * The msqid64_ds structure for alpha architecture.
-+ * The msqid64_ds structure for the MIPS architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
-- * - 2 miscellaneous 64-bit values
-+ * - extension of time_t to 64-bit on 32-bitsystem to solve the y2038 problem
-+ * - 2 miscellaneous unsigned long values
- */
-
- struct msqid64_ds {
- struct ipc64_perm msg_perm;
-+#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
-+ unsigned long __unused1;
-+#endif
- __kernel_time_t msg_stime; /* last msgsnd time */
-+#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
- unsigned long __unused1;
-+#endif
-+#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
-+ unsigned long __unused2;
-+#endif
- __kernel_time_t msg_rtime; /* last msgrcv time */
-+#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
- unsigned long __unused2;
-+#endif
-+#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
-+ unsigned long __unused3;
-+#endif
- __kernel_time_t msg_ctime; /* last change time */
-+#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
- unsigned long __unused3;
-+#endif
- unsigned long msg_cbytes; /* current number of bytes on queue */
- unsigned long msg_qnum; /* number of messages in queue */
- unsigned long msg_qbytes; /* max number of bytes on queue */
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/nbd.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/nbd.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/nbd.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,48 +0,0 @@
-Package: linux-kernel-headers
-Version: 2.5.999-test7-bk-10
-Severity: normal
-
-Hi,
-
-There's an error in the 2.6 <linux/nbd.h>; to make userspace
-compilations work, the following patch needs to be applied:
-
----cut here---
---- linux-2.6.0-test11/include/linux/nbd.h.orig Mon Dec 15 09:48:53 2003
-+++ linux-2.6.0-test11/include/linux/nbd.h Mon Dec 15 09:54:02 2003
-@@ -35,6 +35,9 @@
- /* Define PARANOIA to include extra sanity checking code in here & driver */
- #define PARANOIA
-
-+/* userspace doesn't need the nbd_device structure */
-+#ifdef __KERNEL__
-+
- struct nbd_device {
- int flags;
- int harderror; /* Code of hard error */
-@@ -52,5 +55,7 @@
- int blksize;
- u64 bytesize;
- };
-+
-+#endif
-
- /* This now IS in some kind of include file... */
----cut here---
-
-Paul Clements, the kernel-side NBD maintainer, sent this in for
-inclusion in 2.6.0, but apparantly it didn't make it in time.
-
-It would be nice if you could apply this patch to linux-kernel-headers
-already; but note that it isn't really urgent since my nbd package now
-includes this header in the source package (which actually is the right
-thing to do, as that will allow it at some point to be compiled on
-non-linux ports, too).
-
---
-Wouter Verhelst
-Debian GNU/Linux -- http://www.debian.org
-Nederlandstalige Linux-documentatie -- http://nl.linux.org
-"Stop breathing down my neck." "My breathing is merely a simulation."
-"So is my neck, stop it anyway!"
- -- Voyager's EMH versus the Prometheus' EMH, stardate 51462.
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/s390-asm-byteorder.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/s390-asm-byteorder.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/s390-asm-byteorder.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,31 +0,0 @@
-Subject: Bug#259766: linux-kernel-headers - broken include/asm-s390/byteorder.h
-From: Bastian Blank <waldi@debian.org>
-Package: linux-kernel-headers
-Version: 2.5.999-test7-bk-16
-
-The attached patch fixes include/asm-s390/byteorder.h. The definitions
-are used by some userspace programs which produces weird failures if
-using the broken 64bit conversation. With the patch, this file matches
-linux 2.6.7 vanilla.
-
-
---- include/asm-s390/byteorder.h 2004-06-02 06:28:47.000000000 +0200
-+++ include/asm-s390/byteorder.h 2004-07-16 15:12:07.000000000 +0200
-@@ -50,7 +50,7 @@
- " icm %0,4,2(%1)\n"
- " icm %0,2,1(%1)\n"
- " ic %0,0(%1)"
-- : "=&d" (result) : "a" (x) : "cc" );
-+ : "=&d" (result) : "a" (x), "m" (*x) : "cc" );
- #else /* __s390x__ */
- " lrv %0,%1"
- : "=d" (result) : "m" (*x) );
-@@ -85,7 +85,7 @@
- #ifndef __s390x__
- " icm %0,2,1(%1)\n"
- " ic %0,0(%1)\n"
-- : "=&d" (result) : "a" (x) : "cc" );
-+ : "=&d" (result) : "a" (x), "m" (*x) : "cc" );
- #else /* __s390x__ */
- " lrvh %0,%1"
- : "=d" (result) : "m" (*x) );
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/sparc-asm-elf.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/sparc-asm-elf.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/sparc-asm-elf.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,17 +0,0 @@
-From Ben Collins.
-
---- include/asm-sparc/elf.h~ 2004-01-10 15:57:54.000000000 -0500
-+++ include/asm-sparc/elf.h 2004-01-16 11:56:51.002957991 -0500
-@@ -8,8 +8,11 @@
-
- #include <linux/config.h>
- #include <asm/ptrace.h>
-+
-+#ifdef __KERNEL__
- #include <asm/mbus.h>
- #include <asm/uaccess.h>
-+#endif
-
- /*
- * Sparc section types
-
Deleted: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/toshiba.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/toshiba.patch 2005-05-10 19:13:53 UTC (rev 905)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/toshiba.patch 2005-05-27 14:31:06 UTC (rev 906)
@@ -1,20 +0,0 @@
-Remove a gratuitous inline function from toshiba.h. Taken from linux-2.5 bk
-tree.
-
-===== toshiba.h 1.3 vs 1.4 =====
---- 1.3/include/linux/toshiba.h Mon Sep 29 20:37:49 2003
-+++ 1.4/include/linux/toshiba.h Wed Oct 22 01:10:21 2003
-@@ -33,13 +33,4 @@
- unsigned int edi __attribute__ ((packed));
- } SMMRegisters;
-
--#ifdef CONFIG_PROC_FS
--static int tosh_get_info(char *, char **, off_t, int);
--#else /* !CONFIG_PROC_FS */
--inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght)
--{
-- return 0;
--}
--#endif /* CONFIG_PROC_FS */
--
- #endif
Reply to: