patch against 2.1.78-pre3: HFS, Minix, sound, and SMP warnings and, compilation errors

Trevor Johnson (trevor@jpj.net)
Mon, 5 Jan 1998 17:53:03 -0800 (PST)


I didn't try to fix these compilation errors or warnings:

[in fs/minix/]
dir.c:45: warning: initialization from incompatible pointer type
[in fs/hfs/]
super.c:48: warning: initialization from incompatible pointer type
[in fs/]
/usr/sys/linux/include/linux/hfs_fs.h: In function `hfs_drop_special':
In file included from filesystems.c:28:
/usr/sys/linux/include/linux/hfs_fs.h:345: dereferencing pointer to
incomplete type
/usr/sys/linux/include/linux/hfs_fs.h:345: dereferencing pointer to
incomplete type

The patch below makes these warnings go away:

dev_table.c:40: warning: unused variable `soundcards_installed'
sb_mixer.h:139: warning: `sgnxpro_mix' defined but not used
sched.c:318: warning: `timerlist_lock' defined but not used

--- linux/drivers/sound/sb_mixer.h.orig Tue Dec 23 13:52:02 1997
+++ linux/drivers/sound/sb_mixer.h Mon Jan 5 17:41:34 1998
@@ -135,25 +135,6 @@
MIX_ENT(SOUND_MIXER_LINE3, 0x00, 0, 0, 0x00, 0, 0)
};

-#ifdef __SGNXPRO__
-static mixer_tab sgnxpro_mix = {
-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),
-MIX_ENT(SOUND_MIXER_SYNTH, 0x26, 7, 4, 0x26, 3, 4),
-MIX_ENT(SOUND_MIXER_PCM, 0x04, 7, 4, 0x04, 3, 4),
-MIX_ENT(SOUND_MIXER_SPEAKER, 0x42, 2, 3, 0x00, 0, 0),
-MIX_ENT(SOUND_MIXER_LINE, 0x2e, 7, 4, 0x2e, 3, 4),
-MIX_ENT(SOUND_MIXER_MIC, 0x0a, 2, 3, 0x00, 0, 0),
-MIX_ENT(SOUND_MIXER_CD, 0x28, 7, 4, 0x28, 3, 4),
-MIX_ENT(SOUND_MIXER_IMIX, 0x00, 0, 0, 0x00, 0, 0),
-MIX_ENT(SOUND_MIXER_ALTPCM, 0x00, 0, 0, 0x00, 0, 0),
-MIX_ENT(SOUND_MIXER_RECLEV, 0x00, 0, 0, 0x00, 0, 0),
-MIX_ENT(SOUND_MIXER_IGAIN, 0x00, 0, 0, 0x00, 0, 0),
-MIX_ENT(SOUND_MIXER_OGAIN, 0x00, 0, 0, 0x00, 0, 0)
-};
-#endif
-
static mixer_tab sb16_mix = {
MIX_ENT(SOUND_MIXER_VOLUME, 0x30, 7, 5, 0x31, 7, 5),
MIX_ENT(SOUND_MIXER_BASS, 0x46, 7, 4, 0x47, 7, 4),
--- linux/drivers/sound/dev_table.c.orig Mon Jan 5 16:47:18 1998
+++ linux/drivers/sound/dev_table.c Mon Jan 5 17:45:52 1998
@@ -37,9 +37,8 @@
static void
start_services(void)
{
- int soundcards_installed;
-
#ifdef FIXME
+ int soundcards_installed;
if (!(soundcards_installed = sndtable_get_cardcount()))
return; /* No cards detected */
#endif
--- linux/kernel/sched.c.orig Sat Jan 3 13:46:51 1998
+++ linux/kernel/sched.c Mon Jan 5 17:39:22 1998
@@ -315,7 +315,9 @@
}
}

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

void add_timer(struct timer_list *timer)
{
___
Trevor Johnson