Patch: Fixes for 1.3.96 summarized

pberger@linux01.gwdg.de
Mon, 29 Apr 1996 01:36:20 +0200 (MET DST)


Hi,

here's what I've collected so far.

diff -uNr linux-1.3.96.orig/Makefile linux/Makefile
--- linux-1.3.96.orig/Makefile Mon Apr 29 01:17:07 1996
+++ linux/Makefile Sun Apr 28 19:52:46 1996
@@ -274,7 +274,7 @@

modules_install:
@( \
- MODLIB=/lib/modules/$(VERSION).$(PATCHLEVEL).$(SUBLEVEL); \
+ MODLIB=/lib/modules/$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-`cat .version`; \
cd modules; \
MODULES=""; \
inst_mod() { These="`cat $$1`"; MODULES="$$MODULES $$These"; \
diff -uNr linux-1.3.96.orig/drivers/block/rd.c linux/drivers/block/rd.c
--- linux-1.3.96.orig/drivers/block/rd.c Mon Apr 29 01:17:17 1996
+++ linux/drivers/block/rd.c Sun Apr 28 20:07:49 1996
@@ -99,6 +99,8 @@
unsigned long initrd_start,initrd_end;
int mount_initrd = 1; /* zero if initrd should not be mounted */
#endif
+#else
+int rd_size = 2048;
#endif

/*
diff -uNr linux-1.3.96.orig/drivers/isdn/teles/card.c linux/drivers/isdn/teles/card.c
--- linux-1.3.96.orig/drivers/isdn/teles/card.c Sun Apr 21 10:56:15 1996
+++ linux/drivers/isdn/teles/card.c Fri Apr 26 18:17:42 1996
@@ -652,6 +652,7 @@
break;
case (12):
case (13):
+ ph_command(sp, 8);
sp->ph_active = 5;
isac_sched_event(sp, ISAC_PHCHANGE);
if (!sp->xmtibh)
diff -uNr linux-1.3.96.orig/include/linux/skbuff.h linux/include/linux/skbuff.h
--- linux-1.3.96.orig/include/linux/skbuff.h Mon Apr 29 01:17:30 1996
+++ linux/include/linux/skbuff.h Sun Apr 28 23:55:52 1996
@@ -16,7 +16,7 @@

#include <linux/config.h>
#include <linux/time.h>
-
+#include <asm/types.h>
#include <asm/atomic.h>

#define CONFIG_SKB_CHECK 0
diff -uNr linux-1.3.96.orig/kernel/ksyms.c linux/kernel/ksyms.c
--- linux-1.3.96.orig/kernel/ksyms.c Fri Apr 12 08:49:47 1996
+++ linux/kernel/ksyms.c Sun Apr 28 20:02:58 1996
@@ -120,6 +120,7 @@
X(do_munmap),
X(insert_vm_struct),
X(merge_segments),
+ X(exit_mm),

/* internal kernel memory management */
X(__get_free_pages),
diff -uNr linux-1.3.96.orig/net/ipv4/Config.in linux/net/ipv4/Config.in
--- linux-1.3.96.orig/net/ipv4/Config.in Mon Apr 29 01:17:34 1996
+++ linux/net/ipv4/Config.in Sun Apr 28 20:05:32 1996
@@ -21,7 +21,7 @@
if [ "$CONFIG_NET_ALIAS" = "y" ]; then
tristate 'IP: aliasing support' CONFIG_IP_ALIAS
fi
-if [ "$CONFIG_KERNELD" = "y" ]; then
+if [ "$CONFIG_KERNELD" = "y" ]; then :
# bool 'IP: ARP daemon support (experimental)' CONFIG_ARPD
fi
comment '(it is safe to leave these untouched)'

bye,
Peter

--
Intensively left blank