pre-patch-2.1.37-2 + patch

Michael L. Galbraith (mikeg@weiden.de)
Thu, 1 May 1997 16:45:06 +0200 (MET DST)


Hi All,

The enclosed patch is against pre-patch-2.1.37-2. It doesn't do much
except export 3 symbols needed by ipv6 when compiled as a module.

It also adds..
#define hard_smp_processor_id() 0
to the bottom of include/linux/smp.h.. hope that's right.

Only one oddity to report so far:

mikeg:# lsmod
Module Size Used by
ipv6 68600 0
psaux 1872 1 (autoclean)
hisax 71492 0
isdn 75684 4 [hisax]
slhc 4388 3 [isdn]
ip_alias 480 1 (autoclean)
ne 5824 1
8390 5424 0 [ne]
appletalk 14360 -3 (autoclean) <== hmm??
isofs 16904 0 (autoclean) (unused)
vfat 12244 2 (autoclean)
fat 23036 2 (autoclean) [vfat]

-Mike

diff -urN linux-2.1.37.vanilla/drivers/sound/audio.c linux-2.1.37/drivers/sound/audio.c
--- linux-2.1.37.vanilla/drivers/sound/audio.c Wed Feb 26 11:35:05 1997
+++ linux-2.1.37/drivers/sound/audio.c Thu May 1 13:04:44 1997
@@ -38,6 +38,8 @@
static int audio_format[MAX_AUDIO_DEV];
static int local_conversion[MAX_AUDIO_DEV];

+static int dma_ioctl (int dev, unsigned int cmd, caddr_t arg);
+
#define CNV_MU_LAW 0x00000001
static int
set_format (int dev, int fmt)
diff -urN linux-2.1.37.vanilla/fs/autofs/init.c linux-2.1.37/fs/autofs/init.c
--- linux-2.1.37.vanilla/fs/autofs/init.c Thu May 1 12:38:30 1997
+++ linux-2.1.37/fs/autofs/init.c Thu Apr 24 12:40:06 1997
@@ -10,6 +10,7 @@
*
* ------------------------------------------------------------------------- */

+#include <linux/version.h>
#include <linux/module.h>
#include <linux/auto_fs.h>

diff -urN linux-2.1.37.vanilla/fs/filesystems.c linux-2.1.37/fs/filesystems.c
--- linux-2.1.37.vanilla/fs/filesystems.c Thu May 1 12:38:31 1997
+++ linux-2.1.37/fs/filesystems.c Thu May 1 12:55:22 1997
@@ -27,6 +27,10 @@
#include <linux/major.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
+#ifdef CONFIG_LOCKD
+#include <linux/sunrpc/svc.h>
+#include <linux/lockd/xdr.h>
+#endif
#ifdef CONFIG_KERNELD
#include <linux/kerneld.h>
#endif
diff -urN linux-2.1.37.vanilla/include/linux/smp.h linux-2.1.37/include/linux/smp.h
--- linux-2.1.37.vanilla/include/linux/smp.h Fri Apr 4 21:15:59 1997
+++ linux-2.1.37/include/linux/smp.h Thu May 1 09:46:06 1997
@@ -50,5 +50,6 @@
#define smp_message_pass(t,m,d,w)
#define smp_threads_ready 1
#define kernel_lock()
+#define hard_smp_processor_id() 0
#endif
#endif
diff -urN linux-2.1.37.vanilla/kernel/sched.c linux-2.1.37/kernel/sched.c
--- linux-2.1.37.vanilla/kernel/sched.c Thu May 1 12:39:52 1997
+++ linux-2.1.37/kernel/sched.c Thu May 1 12:48:27 1997
@@ -173,7 +173,9 @@
*/
rwlock_t tasklist_lock = RW_LOCK_UNLOCKED;
spinlock_t scheduler_lock = SPIN_LOCK_UNLOCKED;
+#ifdef __SMP__
static spinlock_t runqueue_lock = SPIN_LOCK_UNLOCKED;
+#endif

/*
* Wake up a process. Put it on the run-queue if it's not
@@ -690,7 +692,9 @@
}
}

+#ifdef __SMP__
static spinlock_t timerlist_lock = SPIN_LOCK_UNLOCKED;
+#endif

void add_timer(struct timer_list *timer)
{
diff -urN linux-2.1.37.vanilla/net/ipv4/Makefile linux-2.1.37/net/ipv4/Makefile
--- linux-2.1.37.vanilla/net/ipv4/Makefile Fri Mar 21 03:17:13 1997
+++ linux-2.1.37/net/ipv4/Makefile Thu May 1 15:18:02 1997
@@ -11,13 +11,19 @@
IPV4_OBJS := utils.o route.o proc.o timer.o protocol.o packet.o \
ip_input.o ip_fragment.o ip_forward.o ip_options.o \
ip_output.o ip_sockglue.o \
- tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o\
+ tcp.o tcp_output.o tcp_timer.o tcp_ipv4.o\
raw.o udp.o arp.o icmp.o devinet.o af_inet.o igmp.o ip_fw.o \
sysctl_net_ipv4.o fib.o ip_nat_dumb.o
IPV4X_OBJS :=

MOD_LIST_NAME := IPV4_MODULES
M_OBJS :=
+
+ifeq ($(CONFIG_IPV6),m)
+IPV4X_OBJS += tcp_input.o
+else
+IPV4_OBJS += tcp_input.o
+endif

ifeq ($(CONFIG_IP_MROUTE),y)
IPV4_OBJS += ipmr.o
diff -urN linux-2.1.37.vanilla/net/ipv4/tcp_input.c linux-2.1.37/net/ipv4/tcp_input.c
--- linux-2.1.37.vanilla/net/ipv4/tcp_input.c Thu May 1 12:38:42 1997
+++ linux-2.1.37/net/ipv4/tcp_input.c Thu May 1 15:59:05 1997
@@ -42,6 +42,9 @@
*/

#include <linux/config.h>
+#if CONFIG_IPV6_MODULE
+#include <linux/module.h>
+#endif
#include <linux/mm.h>
#include <linux/sysctl.h>
#include <net/tcp.h>
@@ -62,7 +65,12 @@
int sysctl_tcp_tsack = 0;
int sysctl_tcp_timestamps = 0;
int sysctl_tcp_window_scaling = 0;
-
+
+#if CONFIG_IPV6_MODULE
+EXPORT_SYMBOL(sysctl_tcp_sack);
+EXPORT_SYMBOL(sysctl_tcp_timestamps);
+EXPORT_SYMBOL(sysctl_tcp_window_scaling);
+#endif

static tcp_sys_cong_ctl_t tcp_sys_cong_ctl_f = &tcp_cong_avoid_vanj;