Import 2.1.78

diff --git a/drivers/sound/gus_wave.c b/drivers/sound/gus_wave.c
index 7e93ac0a7f173ba81d8cf1073db48394559cd49f..460536ac19dd47a1f52ec332ee168e404254d9b0 100644 (file)
--- a/drivers/sound/gus_wave.c
+++ b/drivers/sound/gus_wave.c
@@ -2863,8 +2863,7 @@ int gus_default_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                                vol = 100;
                        gus_mic_vol = vol;
                        set_input_volumes();
-                       vol |= (vol << 8);
-                       val = vol;
+                       val = vol | (vol << 8);
                        break;
                                
                case SOUND_MIXER_LINE:
@@ -2875,8 +2874,7 @@ int gus_default_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                                vol = 100;
                        gus_line_vol = vol;
                        set_input_volumes();
-                       vol |= (vol << 8);
-                       val = vol;
+                       val = vol | (vol << 8);
                        break;
 
                case SOUND_MIXER_PCM:
@@ -2886,8 +2884,7 @@ int gus_default_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                        if (gus_pcm_volume > 100)
                                gus_pcm_volume = 100;
                        gus_audio_update_volume();
-                       gus_pcm_volume |= (gus_pcm_volume << 8);
-                       val = gus_pcm_volume;
+                       val = gus_pcm_volume | (gus_pcm_volume << 8);
                        break;
 
                case SOUND_MIXER_SYNTH:
@@ -2901,8 +2898,7 @@ int gus_default_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                                for (voice = 0; voice < nr_voices; voice++)
                                        dynamic_volume_change(voice);   /* Apply the new vol */
                        }
-                       gus_wave_volume |= (gus_wave_volume << 8);
-                       val = gus_wave_volume;
+                       val = gus_wave_volume | (gus_wave_volume << 8);
                        break;
 
                default:

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index a467af4df9e4d92ffa71e68afc4f97f1e1dfc6d0..a38481c851a5f68876d6658910ed108d3d0490bd 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -298,8 +298,6 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
        }
 
        if (de) {
-printk("remove_proc_entry: parent nlink=%d, file nlink=%d\n",
-parent->nlink, de->nlink);
                proc_unregister(parent, de->low_ino);
                de->nlink = 0;
                de->deleted = 1;

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 07b506f19fcd20cc4b9fd4c3ab6e60d6717ccec3..32c1949f2b2849476ba2a29c00b1fee04527b5ca 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -182,14 +182,14 @@ struct task_struct {
        long counter;
        long priority;
        unsigned long flags;    /* per process flags, defined below */
-       mm_segment_t addr_limit;        /* thread address space:
-                                               0-0xBFFFFFFF for user-thead
-                                               0-0xFFFFFFFF for kernel-thread
-                                        */
        int sigpending;
        long debugreg[8];  /* Hardware debugging registers */
        struct exec_domain *exec_domain;
 /* various fields */
+       mm_segment_t addr_limit;        /* thread address space:
+                                               0-0xBFFFFFFF for user-thead
+                                               0-0xFFFFFFFF for kernel-thread
+                                        */
        struct linux_binfmt *binfmt;
        struct task_struct *next_task, *prev_task;
        struct task_struct *next_run,  *prev_run;
@@ -311,9 +311,10 @@ struct task_struct {
  * your own risk!. Base=0, limit=0x1fffff (=2MB)
  */
 #define INIT_TASK \
-/* state etc */        { 0,DEF_PRIORITY,DEF_PRIORITY,0,KERNEL_DS,0, \
+/* state etc */        { 0,DEF_PRIORITY,DEF_PRIORITY,0,0, \
 /* debugregs */ { 0, },            \
 /* exec domain */&default_exec_domain, \
+/* mm_seg */   KERNEL_DS, \
 /* binfmt */   NULL, \
 /* schedlink */        &init_task,&init_task, &init_task, &init_task, \
 /* ec,brk... */        0,0,0,0,0,0, \