[A "make bzImage" ends with:
System is 2051 kB. System is too big. Try using modules.
]
Andries
Fatal errors:
CONFIG_BSD_PROCESS_ACCT: kernel/acct.c: io_usage unknown field
CONFIG_HFMODEM: drivers/char/hfmodem/main.c: hfmodem_refclock_setscale undef'd
CONFIG_HISAX_NI1: drivers/isdn/hisax/Makefile: l3ni1.o does not exist
CONFIG_SCSI_GDTH: drivers/scsi/gdth_proc.c: SCSI_TIMER undefined
CONFIG_SEEQ8005: drivers/net/seeq8005.c: SLOW_DOWN_IO undefined
CONFIG_UMSDOS_FS: fs/umsdos/*: need update to dentries
CONFIG_VIDEO_BWQCAM: drivers/char/bw-qcam.c: parport_claim_or_block undefined
CONFIG_VIDEO_CQCAM: drivers/char/c-qcam.c: parport_claim_or_block undefined
CONFIG_VIDEO_PMS: drivers/char/videodev.c: init_pms_cards undefined
Warnings:
CONFIG_ATP: atp.c: eeprom_delay() - statement with no effect
CONFIG_ISDN_DRV_SC: message.c: __SLOW_DOWN_IO - statement with no effect
CONFIG_MCD: drivers/cdrom/mcd.h wants to be edited by hand - yuk.
Someone should put selection of port and irq into the normal
configuration procedure. (And treat mcdx.c in the same way.)
CONFIG_NET_SCH*: There are a few warnings about initialization with
wrong pointer type and an unused variable. I started removing
some dead code, but came to the conclusion that almost all code
in net/sched is dummy or dead. Left it untouched.
[ANK: please correct me if I overlook something, but if I look
at a file like net/sched/sch_cbq.c then all routines are static
(so one sees immediately that cbq_prune and cbq_graft are unused),
all that is exported is cbq_ops, but it is unused unless MODULE
is defined, in which case register_qdisc(&cbq_ops) is called.
The routine register_qdisc hangs its arg in a chain starting at
qdisc_base, and this chain is only used by unregister_qdisc() -
there is no lookup function. So, it seems nothing here can be used.]
Changes:
drivers/cdrom/{cm206,mcd}.c: added `static' to cleanup()
drivers/char/ftape/lowlevel/fdc-io.c: one more sigfillset()
drivers/isdn/{avmb1,hisax,pcbit,sc}/*: added `static' a few times -
in more than one place global arrays io[], irq[], mem[] were exported.
drivers/isdn/sc/includes.h: removed a <stdio.h> that caused lots of errors
(Maybe "make depend" should check for such incorrect includes.)
drivers/net/dgrs.c:
Moved `static int is2iv[8] __initdata = {...}' outside function,
since gcc didnt like it inside.
drivers/net/hamradio/soundmodem/gentbl.c:
Output information (during make depend) only when VERBOSE is defined.
drivers/scsi/NCR5380.c: __initdata is ignored for uninitialized variables,
so added zero initialization.
drivers/sound/audio.c: fixed as suggested by mec
drivers/sound/sb_mixer.h: commented out the unused sgnxpro_mix
drivers/sound/softoss.c: removed a static - var also used elsewhere
fs/adfs/*: made adfs_bmap int instead of unsigned int
(Maybe adfs is better and all other filesystems have to change.
However, no actual behaviour is changed here.)
fs/filesystems.c: added init_coda_fs
fs/nls_cp86[234569].c, nls_cp874.c, nls_iso8859-[1-9].c, nls_koi8-r.c:
charset2upper commented out
fs/ufs/ufs_swab.c: added two (__u64 *) casts; this may not be equivalent
to changing the __u32 fs_qbmask[2] into a __u64 fs_qbmask, depending
on the layout of a __u64 on the present architecture; I do not know
what is right, but since the two fields involved are not used anywhere
it does not matter at present.
include/isdn.h: changed type of org_hhc field of isdn_net_local
include/linux/affs_fs.h: added init_affs_fs
include/linux/nls.h: added init_nls_koi8_r
include/linux/smb_fs.h: added init_smb_fs
init/main.c: changed #ifdef CONFIG_SOUNDMODEM into #ifdef CONFIG_HFMODEM
net/af_packet.c: added some declarations
net/socket.c: added wanrouter_init
net/wanrouter/wanmain.c: oui_802_2 commented out; fullname only when MODULE
net/wanrouter/wanproc.c: fixed wandev_inode by inserting an additional NULL
arch/i386/kernel/mca.c: changed the type of proc_mca_read; maybe someone
wants to check that these changes are the right ones.
Maybe something has to be done for other architectures as well.
Patch:
diff -u --recursive --new-file ../linux-2.1.81/linux/arch/i386/kernel/mca.c ./linux/arch/i386/kernel/mca.c
--- ../linux-2.1.81/linux/arch/i386/kernel/mca.c Wed Apr 16 23:14:59 1997
+++ ./linux/arch/i386/kernel/mca.c Sun Jan 25 12:14:59 1998
@@ -65,7 +65,7 @@
static long mca_do_proc_init( long memory_start, long memory_end );
static int mca_default_procfn( char* buf, int slot );
-static long proc_mca_read( struct inode*, struct file*, char* buf, unsigned long count );
+static ssize_t proc_mca_read( struct file*, char*, size_t, loff_t *);
static struct file_operations proc_mca_operations = {
NULL, proc_mca_read,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
@@ -527,7 +527,7 @@
*/
static int mca_fill( char* page, int pid, int type, char** start,
- off_t offset, int length)
+ loff_t *offset, int length)
{
int len = 0;
int slot = 0;
@@ -571,8 +571,8 @@
#define PROC_BLOCK_SIZE (3*1024)
-long proc_mca_read( struct inode* inode, struct file* file,
- char* buf, unsigned long count)
+static ssize_t proc_mca_read( struct file* file,
+ char* buf, size_t count, loff_t *ppos)
{
unsigned long page;
char *start;
@@ -580,6 +580,7 @@
int end;
unsigned int type, pid;
struct proc_dir_entry *dp;
+ struct inode *inode = file->f_dentry->d_inode;
if (count < 0)
return -EINVAL;
@@ -593,7 +594,7 @@
start = 0;
dp = (struct proc_dir_entry *) inode->u.generic_ip;
length = mca_fill((char *) page, pid, type,
- &start, file->f_pos, count);
+ &start, ppos, count);
if (length < 0) {
free_page(page);
return length;
@@ -601,19 +602,19 @@
if (start != 0) {
/* We have had block-adjusting processing! */
copy_to_user(buf, start, length);
- file->f_pos += length;
+ *ppos += length;
count = length;
} else {
/* Static 4kB (or whatever) block capacity */
- if (file->f_pos >= length) {
+ if (*ppos >= length) {
free_page(page);
return 0;
}
- if (count + file->f_pos > length)
- count = length - file->f_pos;
- end = count + file->f_pos;
- copy_to_user(buf, (char *) page + file->f_pos, count);
- file->f_pos = end;
+ if (count + *ppos > length)
+ count = length - *ppos;
+ end = count + *ppos;
+ copy_to_user(buf, (char *) page + *ppos, count);
+ *ppos = end;
}
free_page(page);
return count;
diff -u --recursive --new-file ../linux-2.1.81/linux/arch/i386/kernel/time.c ./linux/arch/i386/kernel/time.c
--- ../linux-2.1.81/linux/arch/i386/kernel/time.c Mon Dec 22 02:27:18 1997
+++ ./linux/arch/i386/kernel/time.c Sun Jan 25 11:47:03 1998
@@ -248,6 +248,7 @@
return count;
}
+#ifndef CONFIG_APM
/*
* this is only used if we have fast gettimeoffset:
*/
@@ -255,6 +256,7 @@
{
do_gettimeofday(tv);
}
+#endif
static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset;
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/cdrom/cm206.c ./linux/drivers/cdrom/cm206.c
--- ../linux-2.1.81/linux/drivers/cdrom/cm206.c Sun Jan 4 19:55:08 1998
+++ ./linux/drivers/cdrom/cm206.c Sun Jan 25 14:59:22 1998
@@ -1274,9 +1274,9 @@
"cm206" /* name of the device type */
};
-/* This routine gets called during initialization if thing go wrong,
+/* This routine gets called during initialization if things go wrong,
* can be used in cleanup_module as well. */
-void cleanup(int level)
+static void cleanup(int level)
{
switch (level) {
case 4:
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/cdrom/mcd.c ./linux/drivers/cdrom/mcd.c
--- ../linux-2.1.81/linux/drivers/cdrom/mcd.c Tue Dec 2 20:41:44 1997
+++ ./linux/drivers/cdrom/mcd.c Sun Jan 25 15:00:03 1998
@@ -1126,9 +1126,9 @@
-/* This routine gets called during initialization if thing go wrong,
+/* This routine gets called during initialization if things go wrong,
* and is used in cleanup_module as well. */
-void cleanup(int level)
+static void cleanup(int level)
{
switch (level) {
case 3:
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/char/ftape/lowlevel/fdc-io.c ./linux/drivers/char/ftape/lowlevel/fdc-io.c
--- ../linux-2.1.81/linux/drivers/char/ftape/lowlevel/fdc-io.c Sat Jan 24 18:52:32 1998
+++ ./linux/drivers/char/ftape/lowlevel/fdc-io.c Sat Jan 24 20:31:53 1998
@@ -404,7 +404,7 @@
spin_lock_irq(¤t->sigmask_lock);
old_sigmask = current->blocked;
- siginitset(¤t->blocked, _BLOCK_ALL);
+ sigfillset(¤t->blocked);
recalc_sigpending(current);
spin_unlock_irq(¤t->sigmask_lock);
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/isdn/avmb1/b1capi.c ./linux/drivers/isdn/avmb1/b1capi.c
--- ../linux-2.1.81/linux/drivers/isdn/avmb1/b1capi.c Sat Sep 20 23:51:54 1997
+++ ./linux/drivers/isdn/avmb1/b1capi.c Sun Jan 25 15:51:44 1998
@@ -52,10 +52,11 @@
/* ------------------------------------------------------------- */
-int portbase = 0x150;
-int irq = 15;
int showcapimsgs = 0; /* used in lli.c */
int loaddebug = 0;
+static int portbase = 0x150;
+#ifdef MODULE
+static int irq = 15;
#ifdef HAS_NEW_SYMTAB
MODULE_AUTHOR("Carsten Paeth <calle@calle.in-berlin.de>");
@@ -63,6 +64,7 @@
MODULE_PARM(irq, "2-15i");
MODULE_PARM(showcapimsgs, "0-3i");
MODULE_PARM(loaddebug, "0-1i");
+#endif
#endif
/* ------------------------------------------------------------- */
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/isdn/hisax/config.c ./linux/drivers/isdn/hisax/config.c
--- ../linux-2.1.81/linux/drivers/isdn/hisax/config.c Fri May 30 06:53:05 1997
+++ ./linux/drivers/isdn/hisax/config.c Sun Jan 25 14:45:10 1998
@@ -179,23 +179,23 @@
char *HiSax_id = HiSaxID;
#ifdef MODULE
/* Variables for insmod */
-int type[] =
+static int type[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-int protocol[] =
+static int protocol[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-int io[] =
+static int io[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
#ifdef CONFIG_HISAX_16_3 /* For Creatix/Teles PnP */
-int io0[] =
+static int io0[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-int io1[] =
+static int io1[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
#endif
-int irq[] =
+static int irq[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-int mem[] =
+static int mem[] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-char *id = HiSaxID;
+static char *id = HiSaxID;
#if (LINUX_VERSION_CODE > 0x020111)
MODULE_AUTHOR("Karsten Keil");
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/isdn/pcbit/module.c ./linux/drivers/isdn/pcbit/module.c
--- ../linux-2.1.81/linux/drivers/isdn/pcbit/module.c Thu Feb 27 19:57:30 1997
+++ ./linux/drivers/isdn/pcbit/module.c Sun Jan 25 14:34:06 1998
@@ -22,10 +22,10 @@
#include <linux/isdnif.h>
#include "pcbit.h"
-int mem[MAX_PCBIT_CARDS] = {0, };
-int irq[MAX_PCBIT_CARDS] = {0, };
+static int mem[MAX_PCBIT_CARDS] = {0, };
+static int irq[MAX_PCBIT_CARDS] = {0, };
-int num_boards;
+static int num_boards;
struct pcbit_dev * dev_pcbit[MAX_PCBIT_CARDS] = {0, 0, 0, 0};
int init_module(void);
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/isdn/sc/hardware.h ./linux/drivers/isdn/sc/hardware.h
--- ../linux-2.1.81/linux/drivers/isdn/sc/hardware.h Thu Feb 27 19:57:30 1997
+++ ./linux/drivers/isdn/sc/hardware.h Sun Jan 25 14:50:52 1998
@@ -16,11 +16,6 @@
this, you must also change the number
of elements in io, irq, and ram to
match. Initialized in init.c */
-/*
-extern unsigned int io[];
-extern unsigned char irq[];
-extern unsigned long ram[];
-*/
#define SIGNATURE 0x87654321 /* Board reset signature */
#define SIG_OFFSET 0x1004 /* Where to find signature in shared RAM */
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/isdn/sc/includes.h ./linux/drivers/isdn/sc/includes.h
--- ../linux-2.1.81/linux/drivers/isdn/sc/includes.h Thu Feb 27 19:57:30 1997
+++ ./linux/drivers/isdn/sc/includes.h Sat Jan 24 23:20:07 1998
@@ -1,6 +1,5 @@
#include <linux/module.h>
#include <linux/version.h>
-#include <stdio.h>
#include <linux/errno.h>
#include <asm/segment.h>
#include <asm/io.h>
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/isdn/sc/init.c ./linux/drivers/isdn/sc/init.c
--- ../linux-2.1.81/linux/drivers/isdn/sc/init.c Fri May 30 06:53:06 1997
+++ ./linux/drivers/isdn/sc/init.c Sun Jan 25 14:52:39 1998
@@ -11,10 +11,10 @@
const char *boardname[] = { "DataCommute/BRI", "DataCommute/PRI", "TeleCommute/BRI" };
/* insmod set parameters */
-unsigned int io[] = {0,0,0,0};
-unsigned char irq[] = {0,0,0,0};
-unsigned long ram[] = {0,0,0,0};
-int do_reset = 0;
+static unsigned int io[] = {0,0,0,0};
+static unsigned char irq[] = {0,0,0,0};
+static unsigned long ram[] = {0,0,0,0};
+static int do_reset = 0;
static int sup_irq[] = { 11, 10, 9, 5, 12, 14, 7, 3, 4, 6 };
#define MAX_IRQS 10
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/net/dgrs.c ./linux/drivers/net/dgrs.c
--- ../linux-2.1.81/linux/drivers/net/dgrs.c Sat Jan 24 18:52:32 1998
+++ ./linux/drivers/net/dgrs.c Sat Jan 24 21:06:16 1998
@@ -1358,6 +1358,8 @@
/*
* Scan for all boards
*/
+static int is2iv[8] __initdata = { 0, 3, 5, 7, 10, 11, 12, 15 };
+
__initfunc(static int
dgrs_scan(struct device *dev))
{
@@ -1463,8 +1465,6 @@
*/
if (EISA_bus)
{
- static int is2iv[8] __initdata = { 0, 3, 5, 7, 10, 11, 12, 15 };
-
for (io = 0x1000; io < 0x9000; io += 0x1000)
{
if (inb(io+ES4H_MANUFmsb) != 0x10
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/net/hamradio/soundmodem/gentbl.c ./linux/drivers/net/hamradio/soundmodem/gentbl.c
--- ../linux-2.1.81/linux/drivers/net/hamradio/soundmodem/gentbl.c Tue Aug 5 18:49:51 1997
+++ ./linux/drivers/net/hamradio/soundmodem/gentbl.c Sat Jan 24 18:50:39 1998
@@ -200,7 +200,9 @@
? "\n\t" : "");
}
}
+#ifdef VERBOSE
fprintf(stderr, "fsk9600: txfilt4: min = %f; max = %f\n", min, max);
+#endif
fprintf(f, "\n};\n\n");
min = max = 0;
memset(c, 0, sizeof(c));
@@ -233,7 +235,9 @@
? "\n\t" : "");
}
}
+#ifdef VERBOSE
fprintf(stderr, "fsk9600: txfilt5: min = %f; max = %f\n", min, max);
+#endif
fprintf(f, "\n};\n\n");
}
@@ -466,7 +470,9 @@
? "\n\t" : "");
}
}
+#ifdef VERBOSE
fprintf(stderr, "hapn4800: txfilt8: min = %f; max = %f\n", min, max);
+#endif
fprintf(f, "\n};\n\n");
min = max = 0;
memset(c, 0, sizeof(c));
@@ -493,7 +499,9 @@
? "\n\t" : "");
}
}
+#ifdef VERBOSE
fprintf(stderr, "hapn4800: txfilt10: min = %f; max = %f\n", min, max);
+#endif
fprintf(f, "\n};\n\n");
/*
* secondly generate tables for the PM transmitter modulator
@@ -524,7 +532,9 @@
? "\n\t" : "");
}
}
+#ifdef VERBOSE
fprintf(stderr, "hapn4800: txfiltpm8: min = %f; max = %f\n", min, max);
+#endif
fprintf(f, "\n};\n\n");
min = max = 0;
memset(c, 0, sizeof(c));
@@ -552,7 +562,9 @@
? "\n\t" : "");
}
}
+#ifdef VERBOSE
fprintf(stderr, "hapn4800: txfiltpm10: min = %f; max = %f\n", min, max);
+#endif
fprintf(f, "\n};\n\n");
}
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/scsi/NCR5380.c ./linux/drivers/scsi/NCR5380.c
--- ../linux-2.1.81/linux/drivers/scsi/NCR5380.c Sat Jan 24 18:52:33 1998
+++ ./linux/drivers/scsi/NCR5380.c Sat Jan 24 21:46:33 1998
@@ -625,7 +625,8 @@
*/
-static int probe_irq __initdata ;
+static int probe_irq __initdata = 0;
+
__initfunc(static void probe_intr (int irq, void *dev_id, struct pt_regs * regs)) {
probe_irq = irq;
};
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/sound/audio.c ./linux/drivers/sound/audio.c
--- ../linux-2.1.81/linux/drivers/sound/audio.c Sat Jan 24 18:52:33 1998
+++ ./linux/drivers/sound/audio.c Sat Jan 24 20:26:44 1998
@@ -350,7 +350,7 @@
int audio_ioctl(int dev, struct fileinfo *file_must_not_be_used,
unsigned int cmd, caddr_t arg)
{
- int val = 0, info, count;
+ int val, count;
unsigned long flags;
struct dma_buffparms *dmap;
@@ -419,16 +419,16 @@
return 0;
case SNDCTL_DSP_GETCAPS:
- info = 1 | DSP_CAP_MMAP; /* Revision level of this ioctl() */
+ val = 1 | DSP_CAP_MMAP; /* Revision level of this ioctl() */
if (audio_devs[dev]->flags & DMA_DUPLEX &&
audio_devs[dev]->open_mode == OPEN_READWRITE)
- info |= DSP_CAP_DUPLEX;
+ val |= DSP_CAP_DUPLEX;
if (audio_devs[dev]->coproc)
- info |= DSP_CAP_COPROC;
+ val |= DSP_CAP_COPROC;
if (audio_devs[dev]->d->local_qlen) /* Device has hidden buffers */
- info |= DSP_CAP_BATCH;
+ val |= DSP_CAP_BATCH;
if (audio_devs[dev]->d->trigger) /* Supports SETTRIGGER */
- info |= DSP_CAP_TRIGGER;
+ val |= DSP_CAP_TRIGGER;
break;
case SOUND_PCM_WRITE_RATE:
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/sound/sb_mixer.h ./linux/drivers/sound/sb_mixer.h
--- ../linux-2.1.81/linux/drivers/sound/sb_mixer.h Tue Dec 23 22:52:02 1997
+++ ./linux/drivers/sound/sb_mixer.h Sat Jan 24 23:32:33 1998
@@ -136,7 +136,8 @@
};
#ifdef __SGNXPRO__
-static mixer_tab sgnxpro_mix = {
+#if 0
+static mixer_tab sgnxpro_mix = { /* not used anywhere */
MIX_ENT(SOUND_MIXER_VOLUME, 0x22, 7, 4, 0x22, 3, 4),
MIX_ENT(SOUND_MIXER_BASS, 0x46, 2, 3, 0x00, 0, 0),
MIX_ENT(SOUND_MIXER_TREBLE, 0x44, 2, 3, 0x00, 0, 0),
@@ -152,6 +153,7 @@
MIX_ENT(SOUND_MIXER_IGAIN, 0x00, 0, 0, 0x00, 0, 0),
MIX_ENT(SOUND_MIXER_OGAIN, 0x00, 0, 0, 0x00, 0, 0)
};
+#endif
#endif
static mixer_tab sb16_mix = {
diff -u --recursive --new-file ../linux-2.1.81/linux/drivers/sound/softoss.c ./linux/drivers/sound/softoss.c
--- ../linux-2.1.81/linux/drivers/sound/softoss.c Sun Jan 4 19:40:16 1998
+++ ./linux/drivers/sound/softoss.c Sun Jan 25 16:04:51 1998
@@ -106,7 +106,7 @@
static struct softsyn_devc sdev_info =
{0};
-static softsyn_devc *devc = &sdev_info;
+softsyn_devc *devc = &sdev_info; /* used in softoss_rs.c */
static struct voice_alloc_info *voice_alloc;
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/adfs/inode.c ./linux/fs/adfs/inode.c
--- ../linux-2.1.81/linux/fs/adfs/inode.c Wed Jan 21 01:44:58 1998
+++ ./linux/fs/adfs/inode.c Sun Jan 25 14:03:21 1998
@@ -71,7 +71,7 @@
return inode->u.adfs_i.file_id;
}
-unsigned int adfs_bmap (struct inode *inode, int block)
+int adfs_bmap (struct inode *inode, int block)
{
struct super_block *sb = inode->i_sb;
unsigned int blk;
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/filesystems.c ./linux/fs/filesystems.c
--- ../linux-2.1.81/linux/fs/filesystems.c Wed Jan 21 01:44:58 1998
+++ ./linux/fs/filesystems.c Sun Jan 25 04:51:38 1998
@@ -37,6 +37,10 @@
#include <linux/init.h>
#include <linux/nls.h>
+#ifdef CONFIG_CODA_FS
+extern int init_coda_fs(void);
+#endif
+
extern void device_setup(void);
extern void binfmt_setup(void);
extern void free_initmem(void);
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_cp862.c ./linux/fs/nls/nls_cp862.c
--- ../linux-2.1.81/linux/fs/nls/nls_cp862.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_cp862.c Sun Jan 25 04:39:14 1998
@@ -391,6 +391,7 @@
page20, NULL, page22, page23, NULL, page25, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -425,7 +426,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0x00, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_cp863.c ./linux/fs/nls/nls_cp863.c
--- ../linux-2.1.81/linux/fs/nls/nls_cp863.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_cp863.c Sun Jan 25 04:39:47 1998
@@ -355,6 +355,7 @@
page20, NULL, page22, page23, NULL, page25, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -389,7 +390,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0x00, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_cp864.c ./linux/fs/nls/nls_cp864.c
--- ../linux-2.1.81/linux/fs/nls/nls_cp864.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_cp864.c Sun Jan 25 04:40:16 1998
@@ -346,6 +346,7 @@
NULL, NULL, NULL, NULL, NULL, NULL, pagefe, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -380,7 +381,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_cp865.c ./linux/fs/nls/nls_cp865.c
--- ../linux-2.1.81/linux/fs/nls/nls_cp865.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_cp865.c Sun Jan 25 04:40:39 1998
@@ -355,6 +355,7 @@
page20, NULL, page22, page23, NULL, page25, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -389,7 +390,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0x00, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_cp866.c ./linux/fs/nls/nls_cp866.c
--- ../linux-2.1.81/linux/fs/nls/nls_cp866.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_cp866.c Sun Jan 25 04:41:23 1998
@@ -283,6 +283,7 @@
NULL, page21, page22, NULL, NULL, page25, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -317,7 +318,7 @@
0xf0, 0x00, 0xf2, 0x00, 0xf4, 0x00, 0xf6, 0x00, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_cp869.c ./linux/fs/nls/nls_cp869.c
--- ../linux-2.1.81/linux/fs/nls/nls_cp869.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_cp869.c Sun Jan 25 04:41:44 1998
@@ -247,6 +247,7 @@
page20, NULL, NULL, NULL, NULL, page25, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -281,7 +282,7 @@
0xf0, 0xf1, 0x00, 0x00, 0x00, 0xf5, 0x00, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_cp874.c ./linux/fs/nls/nls_cp874.c
--- ../linux-2.1.81/linux/fs/nls/nls_cp874.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_cp874.c Sun Jan 25 04:42:13 1998
@@ -211,6 +211,7 @@
page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -245,7 +246,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-1.c ./linux/fs/nls/nls_iso8859-1.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-1.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-1.c Sun Jan 25 04:42:45 1998
@@ -135,6 +135,7 @@
page00, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -169,7 +170,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf7, /* 0xf0-0xf7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-2.c ./linux/fs/nls/nls_iso8859-2.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-2.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-2.c Sun Jan 25 04:43:26 1998
@@ -207,6 +207,7 @@
page00, page01, page02, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -241,7 +242,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf7, /* 0xf0-0xf7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-3.c ./linux/fs/nls/nls_iso8859-3.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-3.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-3.c Sun Jan 25 04:44:28 1998
@@ -207,6 +207,7 @@
page00, page01, page02, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -241,7 +242,7 @@
0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf7, /* 0xf0-0xf7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-4.c ./linux/fs/nls/nls_iso8859-4.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-4.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-4.c Sun Jan 25 04:44:44 1998
@@ -207,6 +207,7 @@
page00, page01, page02, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -241,7 +242,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf7, /* 0xf0-0xf7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-5.c ./linux/fs/nls/nls_iso8859-5.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-5.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-5.c Sun Jan 25 04:45:11 1998
@@ -211,6 +211,7 @@
NULL, page21, NULL, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -245,7 +246,7 @@
0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xf0-0xf7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-6.c ./linux/fs/nls/nls_iso8859-6.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-6.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-6.c Sun Jan 25 04:45:41 1998
@@ -171,6 +171,7 @@
page00, NULL, NULL, NULL, NULL, NULL, page06, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -205,7 +206,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-7.c ./linux/fs/nls/nls_iso8859-7.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-7.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-7.c Sun Jan 25 04:46:27 1998
@@ -247,6 +247,7 @@
page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -281,7 +282,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xf0-0xf7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-8.c ./linux/fs/nls/nls_iso8859-8.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-8.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-8.c Sun Jan 25 04:46:43 1998
@@ -211,6 +211,7 @@
page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -245,7 +246,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_iso8859-9.c ./linux/fs/nls/nls_iso8859-9.c
--- ../linux-2.1.81/linux/fs/nls/nls_iso8859-9.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_iso8859-9.c Sun Jan 25 04:46:58 1998
@@ -171,6 +171,7 @@
page00, page01, NULL, NULL, NULL, NULL, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -205,7 +206,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf7, /* 0xf0-0xf7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/nls/nls_koi8-r.c ./linux/fs/nls/nls_koi8-r.c
--- ../linux-2.1.81/linux/fs/nls/nls_koi8-r.c Thu Oct 23 23:00:15 1997
+++ ./linux/fs/nls/nls_koi8-r.c Sun Jan 25 04:47:16 1998
@@ -283,6 +283,7 @@
NULL, NULL, page22, page23, NULL, page25, NULL, NULL,
};
+#if 0
static unsigned char charset2upper[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
@@ -317,7 +318,7 @@
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
};
-
+#endif
static void inc_use_count(void)
{
diff -u --recursive --new-file ../linux-2.1.81/linux/fs/ufs/ufs_swab.c ./linux/fs/ufs/ufs_swab.c
--- ../linux-2.1.81/linux/fs/ufs/ufs_swab.c Sun Nov 9 15:36:42 1997
+++ ./linux/fs/ufs/ufs_swab.c Sun Jan 25 12:49:16 1998
@@ -117,8 +117,8 @@
be32_to_cpus(&usb->fs_cpc);
be16_to_cpus__between(*usb,fs_opostbl,fs_sparecon);
be32_to_cpus__between(*usb,fs_sparecon,fs_qbmask);
- be64_to_cpus(&usb->fs_qbmask);
- be64_to_cpus(&usb->fs_qfmask);
+ be64_to_cpus((__u64 *) &usb->fs_qbmask);
+ be64_to_cpus((__u64 *) &usb->fs_qfmask);
be32_to_cpus__between(*usb,fs_postblformat,fs_magic);
#endif
}
diff -u --recursive --new-file ../linux-2.1.81/linux/include/linux/adfs_fs.h ./linux/include/linux/adfs_fs.h
--- ../linux-2.1.81/linux/include/linux/adfs_fs.h Wed Jan 21 01:44:58 1998
+++ ./linux/include/linux/adfs_fs.h Sun Jan 25 14:04:31 1998
@@ -156,7 +156,7 @@
extern unsigned long adfs_inode_generate (unsigned long parent_id, int diridx);
extern unsigned long adfs_inode_objid (struct inode *inode);
extern unsigned int adfs_parent_bmap (struct inode *inode, int block);
-extern unsigned int adfs_bmap (struct inode *inode, int block);
+extern int adfs_bmap (struct inode *inode, int block);
extern void adfs_read_inode (struct inode *inode);
/* map.c */
diff -u --recursive --new-file ../linux-2.1.81/linux/include/linux/adfs_fs_fs.h ./linux/include/linux/adfs_fs_fs.h
--- ../linux-2.1.81/linux/include/linux/adfs_fs_fs.h Wed Jan 21 01:44:58 1998
+++ ./linux/include/linux/adfs_fs_fs.h Sun Jan 25 14:04:40 1998
@@ -148,7 +148,7 @@
extern unsigned long adfs_inode_generate (unsigned long parent_id, int diridx);
extern unsigned long adfs_inode_objid (struct inode *inode);
extern unsigned int adfs_parent_bmap (struct inode *inode, int block);
-extern unsigned int adfs_bmap (struct inode *inode, int block);
+extern int adfs_bmap (struct inode *inode, int block);
extern void adfs_read_inode (struct inode *inode);
/* map.c */
diff -u --recursive --new-file ../linux-2.1.81/linux/include/linux/affs_fs.h ./linux/include/linux/affs_fs.h
--- ../linux-2.1.81/linux/include/linux/affs_fs.h Mon Jan 12 23:46:26 1998
+++ ./linux/include/linux/affs_fs.h Sun Jan 25 00:52:32 1998
@@ -89,6 +89,7 @@
/* super.c */
extern int affs_fs(void);
+extern int init_affs_fs(void);
/* file.c */
diff -u --recursive --new-file ../linux-2.1.81/linux/include/linux/isdn.h ./linux/include/linux/isdn.h
--- ../linux-2.1.81/linux/include/linux/isdn.h Mon Nov 3 19:09:22 1997
+++ ./linux/include/linux/isdn.h Sun Jan 25 15:37:15 1998
@@ -425,25 +425,11 @@
struct isdn_net_dev_s *netdev; /* Ptr to netdev */
struct sk_buff *first_skb; /* Ptr to skb that triggers dialing */
struct sk_buff *sav_skb; /* Ptr to skb, rejected by LL-driver*/
-#if (LINUX_VERSION_CODE < 0x02010F)
- /* Ptr to orig. header_cache_bind */
- void (*org_hcb)(struct hh_cache **,
- struct device *,
- unsigned short,
- __u32);
-#else
-#if (LINUX_VERSION_CODE < 0x2011E)
+
/* Ptr to orig. hard_header_cache */
- int (*org_hhc)(struct dst_entry *dst,
- struct dst_entry *neigh,
+ int (*org_hhc)(struct neighbour *neigh,
struct hh_cache *hh);
-#else
- /* Ptr to orig. hard_header_cache */
- int (*org_hhc)(struct dst_entry *dst,
- struct neighbour *neigh,
- struct hh_cache *hh);
-#endif
-#endif
+
/* Ptr to orig. header_cache_update */
void (*org_hcu)(struct hh_cache *,
struct device *,
diff -u --recursive --new-file ../linux-2.1.81/linux/include/linux/nls.h ./linux/include/linux/nls.h
--- ../linux-2.1.81/linux/include/linux/nls.h Thu Oct 23 23:00:15 1997
+++ ./linux/include/linux/nls.h Sun Jan 25 00:41:25 1998
@@ -52,3 +52,4 @@
extern int init_nls_cp866(void);
extern int init_nls_cp869(void);
extern int init_nls_cp874(void);
+extern int init_nls_koi8_r(void);
diff -u --recursive --new-file ../linux-2.1.81/linux/include/linux/smb_fs.h ./linux/include/linux/smb_fs.h
--- ../linux-2.1.81/linux/include/linux/smb_fs.h Sat Jan 24 18:52:35 1998
+++ ./linux/include/linux/smb_fs.h Sun Jan 25 15:44:13 1998
@@ -99,6 +99,7 @@
int smb_notify_change(struct dentry *, struct iattr *);
unsigned long smb_invent_inos(unsigned long);
struct inode *smb_iget(struct super_block *, struct smb_fattr *);
+extern int init_smb_fs(void);
/* linux/fs/smbfs/proc.c */
__u32 smb_len(unsigned char *);
diff -u --recursive --new-file ../linux-2.1.81/linux/init/main.c ./linux/init/main.c
--- ../linux-2.1.81/linux/init/main.c Sat Jan 24 18:52:36 1998
+++ ./linux/init/main.c Sun Jan 25 01:45:41 1998
@@ -701,7 +701,7 @@
#ifdef CONFIG_PLIP
{ "plip=", plip_setup },
#endif
-#ifdef CONFIG_SOUNDMODEM
+#ifdef CONFIG_HFMODEM
{ "hfmodem=", hfmodem_setup },
#endif
#ifdef CONFIG_PMAC_CONSOLE
diff -u --recursive --new-file ../linux-2.1.81/linux/net/packet/af_packet.c ./linux/net/packet/af_packet.c
--- ../linux-2.1.81/linux/net/packet/af_packet.c Tue Jan 13 00:28:28 1998
+++ ./linux/net/packet/af_packet.c Sun Jan 25 05:24:54 1998
@@ -70,6 +70,14 @@
#include <linux/if_frad.h>
#endif
+#ifdef CONFIG_BRIDGE
+#include <net/br.h>
+#endif
+
+#ifdef CONFIG_DLCI
+extern int dlci_ioctl(unsigned int, void*);
+#endif
+
/*
Old SOCK_PACKET. Do exist programs, which use it?
(not counting tcpdump) - lots of them yes - AC.
diff -u --recursive --new-file ../linux-2.1.81/linux/net/socket.c ./linux/net/socket.c
--- ../linux-2.1.81/linux/net/socket.c Tue Jan 13 00:28:28 1998
+++ ./linux/net/socket.c Sun Jan 25 05:18:01 1998
@@ -1432,6 +1432,9 @@
}
extern void sk_init(void);
+#ifdef CONFIG_WAN_ROUTER
+extern void wanrouter_init(void);
+#endif
__initfunc(void sock_init(void))
{
diff -u --recursive --new-file ../linux-2.1.81/linux/net/wanrouter/wanmain.c ./linux/net/wanrouter/wanmain.c
--- ../linux-2.1.81/linux/net/wanrouter/wanmain.c Mon Jan 12 23:46:27 1998
+++ ./linux/net/wanrouter/wanmain.c Sun Jan 25 05:09:43 1998
@@ -80,8 +80,10 @@
* Global Data
*/
+#ifdef MODULE
static char fullname[] = "WAN Router";
static char copyright[] = "(c) 1995-1997 Sangoma Technologies Inc.";
+#endif
static char modname[] = ROUTER_NAME; /* short module name */
wan_device_t * router_devlist = NULL; /* list of registered devices */
static int devcnt = 0;
@@ -91,7 +93,9 @@
*/
static unsigned char oui_ether[] = { 0x00, 0x00, 0x00 };
+#if 0
static unsigned char oui_802_2[] = { 0x00, 0x80, 0xC2 };
+#endif
#ifdef MODULE
diff -u --recursive --new-file ../linux-2.1.81/linux/net/wanrouter/wanproc.c ./linux/net/wanrouter/wanproc.c
--- ../linux-2.1.81/linux/net/wanrouter/wanproc.c Mon Jan 12 23:46:27 1998
+++ ./linux/net/wanrouter/wanproc.c Sun Jan 25 05:13:29 1998
@@ -158,6 +158,7 @@
NULL, /* mknod */
NULL, /* rename */
NULL, /* readlink */
+ NULL, /* follow_link */
NULL, /* readpage */
NULL, /* writepage */
NULL, /* bmap */