r1142 - trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches
Thiemo Seufer
ths-guest@haydn.debian.org
Sun, 15 Aug 2004 20:13:40 -0600
Author: ths-guest
Date: 2004-08-15 20:13:28 -0600 (Sun, 15 Aug 2004)
New Revision: 1142
Removed:
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/01_export-objs.dpatch
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/02_addinitrd-cleanup.dpatch
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/20_swarm-TIOCGSERIAL.dpatch
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/23_swarm-highmem-tlb.dpatch
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/41_ip22-ipv6.dpatch
Log:
Delete old patches.
Deleted: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/01_export-objs.dpatch
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/01_export-objs.dpatch 2004-08-16 01:48:17 UTC (rev 1141)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/01_export-objs.dpatch 2004-08-16 02:13:28 UTC (rev 1142)
@@ -1,57 +0,0 @@
-#! /bin/sh -e
-## 01_export-objs.dpatch by Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Export missing module symbols
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
---- ./arch/mips/mm/Makefile.old 2004-05-15 18:22:32.000000000 +0200
-+++ ./arch/mips/mm/Makefile 2004-05-15 18:23:00.000000000 +0200
-@@ -10,7 +10,7 @@ USE_STANDARD_AS_RULE := true
-
- O_TARGET := mm.o
-
--export-objs += cache.o ioremap.o loadmmu.o remap.o
-+export-objs := cache.o ioremap.o loadmmu.o remap.o tlb-sb1.o
- obj-y += cache.o extable.o init.o ioremap.o fault.o \
- loadmmu.o
-
---- ./arch/mips/pci/Makefile.old 2004-05-15 18:17:47.000000000 +0200
-+++ ./arch/mips/pci/Makefile 2004-05-15 18:17:59.000000000 +0200
-@@ -8,8 +8,6 @@
-
- O_TARGET := pci-core.o
-
--export-objs = pci.o
--
- obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o
- obj-$(CONFIG_MIPS_GT64120) += ops-gt64120.o
- obj-$(CONFIG_MIPS_MSC) += ops-msc.o
---- ./drivers/usb/Makefile.old 2004-05-15 18:09:16.000000000 +0200
-+++ ./drivers/usb/Makefile 2004-05-15 18:09:30.000000000 +0200
-@@ -10,7 +10,7 @@ O_TARGET := usbdrv.o
-
- # Objects that export symbols.
-
--export-objs := hcd.o usb.o ov511.o pwc-uncompress.o
-+export-objs := hcd.o usb.o usb-midi.o ov511.o pwc-uncompress.o
-
- # Multipart objects.
-
Deleted: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/02_addinitrd-cleanup.dpatch
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/02_addinitrd-cleanup.dpatch 2004-08-16 01:48:17 UTC (rev 1141)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/02_addinitrd-cleanup.dpatch 2004-08-16 02:13:28 UTC (rev 1142)
@@ -1,61 +0,0 @@
-#! /bin/sh -e
-## 02_addinitrd-cleanup.dpatch by Guido Guenther <agx@sigxcpu.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Minor fixes for addinitrd.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-Index: arch/mips/boot/addinitrd.c
-===================================================================
-RCS file: /home/cvs/linux/arch/mips/boot/addinitrd.c,v
-retrieving revision 1.1.6.2
-diff -u -p -u -r1.1.6.2 addinitrd.c
---- arch/mips/boot/addinitrd.c 5 Aug 2002 23:53:31 -0000 1.1.6.2
-+++ arch/mips/boot/addinitrd.c 21 Sep 2003 00:14:13 -0000
-@@ -2,6 +2,8 @@
- * addinitrd - program to add a initrd image to an ecoff kernel
- *
- * (C) 1999 Thomas Bogendoerfer
-+ * minor modifications, cleanup: Guido Guenther <agx@sigxcpu.org>
-+ *
- */
-
- #include <sys/types.h>
-@@ -54,7 +56,7 @@ int main (int argc, char *argv[])
- exit (1);
- }
-
-- if ((fd_vmlinux = open (argv[1],O_RDWR)) < 0)
-+ if ((fd_vmlinux = open (argv[1],O_RDONLY)) < 0)
- die ("open vmlinux");
- if (read (fd_vmlinux, &efile, sizeof efile) != sizeof efile)
- die ("read file header");
-@@ -78,6 +80,11 @@ int main (int argc, char *argv[])
- swab = 1;
- }
-
-+ /* make sure we have an empty data segment for the initrd */
-+ if( eaout.dsize || esecs[1].s_size ) {
-+ fprintf(2,"Data segment not empty. Giving up!");
-+ exit(1);
-+ }
- if ((fd_initrd = open (argv[2], O_RDONLY)) < 0)
- die ("open initrd");
- if (fstat (fd_initrd, &st) < 0)
Deleted: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/20_swarm-TIOCGSERIAL.dpatch
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/20_swarm-TIOCGSERIAL.dpatch 2004-08-16 01:48:17 UTC (rev 1141)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/20_swarm-TIOCGSERIAL.dpatch 2004-08-16 02:13:28 UTC (rev 1142)
@@ -1,80 +0,0 @@
-#! /bin/sh -e
-## 20_swarm-TIOCGSERIAL.dpatch by Peter de Schrijver <p2@mind.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: TIOCGSERIAL implementation for SWARM.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
---- linux-2.4.24/drivers/char/sb1250_duart.c 2003-08-25 13:44:41.000000000 +0200
-+++ linux-qube/linux-2.4.24/linux/drivers/char/sb1250_duart.c 2004-04-03 20:40:05.000000000 +0200
-@@ -498,9 +498,31 @@
- duart_set_cflag(us->line, tty->termios->c_cflag);
- }
-
-+static int get_serial_info(uart_state_t *us, struct serial_struct * retinfo) {
-+
-+ struct serial_struct tmp;
-+
-+ memset(&tmp, 0, sizeof(tmp));
-+
-+ tmp.type=PORT_SB1250;
-+ tmp.line=us->line;
-+ tmp.port=A_DUART_CHANREG(tmp.line,0);
-+ tmp.irq=K_INT_UART_0 + tmp.line;
-+ tmp.xmit_fifo_size=16; /* fixed by hw */
-+ tmp.baud_base=5000000;
-+ tmp.io_type=SERIAL_IO_MEM;
-+
-+ if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
-+ return -EFAULT;
-+
-+ return 0;
-+}
-+
- static int duart_ioctl(struct tty_struct *tty, struct file * file,
- unsigned int cmd, unsigned long arg)
- {
-+ uart_state_t *us = (uart_state_t *) tty->driver_data;
-+
- /* if (serial_paranoia_check(info, tty->device, "rs_ioctl"))
- return -ENODEV;*/
- switch (cmd) {
-@@ -517,7 +539,7 @@
- printk("Ignoring TIOCMSET\n");
- break;
- case TIOCGSERIAL:
-- printk("Ignoring TIOCGSERIAL\n");
-+ return get_serial_info(us,(struct serial_struct *) arg);
- break;
- case TIOCSSERIAL:
- printk("Ignoring TIOCSSERIAL\n");
---- linux-2.4.24/include/linux/serial.h 2002-08-03 02:39:45.000000000 +0200
-+++ linux-qube/linux-2.4.24/linux/include/linux/serial.h 2004-04-03 20:14:37.000000000 +0200
-@@ -75,7 +75,8 @@
- #define PORT_16654 11
- #define PORT_16850 12
- #define PORT_RSA 13 /* RSA-DV II/S card */
--#define PORT_MAX 13
-+#define PORT_SB1250 14
-+#define PORT_MAX 14
-
- #define SERIAL_IO_PORT 0
- #define SERIAL_IO_HUB6 1
-
Deleted: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/23_swarm-highmem-tlb.dpatch
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/23_swarm-highmem-tlb.dpatch 2004-08-16 01:48:17 UTC (rev 1141)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/23_swarm-highmem-tlb.dpatch 2004-08-16 02:13:28 UTC (rev 1142)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-## 23_swarm-highmem-tlb.dpatch by Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Export missing module symbol
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
---- kernel-source-2.4.26/arch/mips/mm/tlb-sb1.c.old 2004-05-13 15:58:52.000000000 +0200
-+++ kernel-source-2.4.26/arch/mips/mm/tlb-sb1.c 2004-05-13 15:59:49.000000000 +0200
-@@ -18,6 +18,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
- #include <linux/config.h>
-+#include <linux/module.h>
- #include <linux/init.h>
- #include <asm/mmu_context.h>
- #include <asm/bootinfo.h>
-@@ -238,6 +238,9 @@ void local_flush_tlb_one(unsigned long p
- local_irq_restore(flags);
- }
-
-+/* The highmem code wants this. */
-+EXPORT_SYMBOL(local_flush_tlb_one);
-+
- /* All entries common to a mm share an asid. To effectively flush
- these entries, we just bump the asid. */
- void local_flush_tlb_mm(struct mm_struct *mm)
Deleted: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/41_ip22-ipv6.dpatch
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/41_ip22-ipv6.dpatch 2004-08-16 01:48:17 UTC (rev 1141)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/41_ip22-ipv6.dpatch 2004-08-16 02:13:28 UTC (rev 1142)
@@ -1,101 +0,0 @@
-#! /bin/sh -e
-## 41_ip22-ipv6.dpatch by Jochen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Hi,
-## DP:
-## DP: it looks like IPv6 support on Indy is pretty bad because the
-## DP: builtin ethernet doesn't receive multicast frames (Protocols like OSPF or
-## DP: RIP2 suffer problems, as well). The following patch is supposed to fix
-## DP: this.
-## DP:
-## DP: I guess my Indy is the first one talking IPv6 under Linux then ;-)
-## DP:
-## DP: --jochen
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
---- drivers/net/sgiseeq.c.orig 2002-09-29 08:58:12.000000000 +0200
-+++ drivers/net/sgiseeq.c 2002-09-29 11:24:48.000000000 +0200
-@@ -161,12 +161,6 @@
-
- seeq_load_eaddr(dev, sp->sregs);
-
-- /* XXX for now just accept packets directly to us
-- * XXX and ether-broadcast. Will do multicast and
-- * XXX promiscuous mode later. -davem
-- */
-- sp->mode = SEEQ_RCMD_RBCAST;
--
- /* Setup tx ring. */
- for(i = 0; i < SEEQ_TX_BUFFERS; i++) {
- if(!ib->tx_desc[i].tdma.pbuf) {
-@@ -333,10 +327,15 @@
- /* Copy out of kseg1 to avoid silly cache flush. */
- eth_copy_and_sum(skb, pkt_pointer + 2, len, 0);
- skb->protocol = eth_type_trans(skb, dev);
-- netif_rx(skb);
-- dev->last_rx = jiffies;
-- sp->stats.rx_packets++;
-- sp->stats.rx_bytes += len;
-+ if (memcmp(skb->mac.ethernet->h_source, dev->dev_addr, 6)) {
-+ netif_rx(skb);
-+ dev->last_rx = jiffies;
-+ sp->stats.rx_packets++;
-+ sp->stats.rx_bytes += len;
-+ } else {
-+ /* Silently drop my own packets */
-+ dev_kfree_skb_irq(skb);
-+ }
- } else {
- printk ("%s: Memory squeeze, deferring packet.\n",
- dev->name);
-@@ -579,6 +578,22 @@
-
- static void sgiseeq_set_multicast(struct net_device *dev)
- {
-+ struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv;
-+ unsigned char oldmode = sp->mode;
-+
-+ if(dev->flags & IFF_PROMISC)
-+ sp->mode = SEEQ_RCMD_RANY;
-+ else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count)
-+ sp->mode = SEEQ_RCMD_RBMCAST;
-+ else
-+ sp->mode = SEEQ_RCMD_RBCAST;
-+
-+ /* XXX I know this sucks, but is there a better way to reprogram
-+ * XXX the receiver? At least, this shouldn't happen too often.
-+ */
-+
-+ if (oldmode != sp->mode)
-+ sgiseeq_reset(dev);
- }
-
- static inline void setup_tx_ring(struct sgiseeq_tx_desc *buf, int nbufs)
-@@ -642,6 +657,7 @@
- sp->sregs = sregs;
- sp->hregs = hregs;
- sp->name = sgiseeqstr;
-+ sp->mode = SEEQ_RCMD_RBCAST;
-
- sp->srings.rx_desc = (struct sgiseeq_rx_desc *)
- (KSEG1ADDR(ALIGNED(&sp->srings.rxvector[0])));
-
-