Refresh patches for addition of no_llseek calls

Signed-off-by: Takashi Iwai <tiwai@suse.de>

7 files changed, 61 insertions, 53 deletions

diff --git a/acore/control.patch b/acore/control.patch
index 4b67090b6..28e2d51bb 100644
--- a/acore/control.patch
+++ b/acore/control.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/control.c	2009-11-18 14:27:35.000000000 +0100
-+++ control.c	2009-12-15 22:17:50.000000000 +0100
+--- ../alsa-kernel/core/control.c	2010-04-13 12:01:49.080966488 +0200
++++ control.c	2010-04-13 13:03:53.852789224 +0200
 @@ -1,3 +1,5 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
@@ -14,7 +14,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
  #include <linux/time.h>
-@@ -727,6 +730,10 @@
+@@ -732,6 +735,10 @@
  	return result;
  }
  
@@ -25,7 +25,7 @@
  static int snd_ctl_elem_read_user(struct snd_card *card,
  				  struct snd_ctl_elem_value __user *_control)
  {
-@@ -783,6 +790,10 @@
+@@ -788,6 +795,10 @@
  	return result;
  }
  
@@ -36,7 +36,7 @@
  static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
  				   struct snd_ctl_elem_value __user *_control)
  {
-@@ -1371,25 +1382,44 @@
+@@ -1376,26 +1387,45 @@
  /*
   * ioctl32 compat
   */
@@ -72,8 +72,9 @@
  	.read =		snd_ctl_read,
  	.open =		snd_ctl_open,
  	.release =	snd_ctl_release,
- 	.poll =		snd_ctl_poll,
+ 	.llseek =	no_llseek,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
+ 	.poll =		snd_ctl_poll,
  	.unlocked_ioctl =	snd_ctl_ioctl,
  	.compat_ioctl =	snd_ctl_ioctl_compat,
 +#else
diff --git a/acore/oss/mixer_oss.patch b/acore/oss/mixer_oss.patch
index 46825b5fb..6e66b4fc7 100644
--- a/acore/oss/mixer_oss.patch
+++ b/acore/oss/mixer_oss.patch
@@ -1,5 +1,5 @@
---- ../../alsa-kernel/core/oss/mixer_oss.c	2007-12-20 10:19:01.000000000 +0100
-+++ mixer_oss.c	2007-12-20 10:45:48.000000000 +0100
+--- ../../alsa-kernel/core/oss/mixer_oss.c	2010-04-13 12:01:49.080966488 +0200
++++ mixer_oss.c	2010-04-13 13:07:14.784700677 +0200
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
@@ -13,7 +13,7 @@
  #include <linux/slab.h>
  #include <linux/time.h>
  #include <linux/string.h>
-@@ -377,24 +379,43 @@
+@@ -385,25 +387,44 @@
  	return snd_mixer_oss_ioctl1(&fmixer, cmd, arg);
  }
  
@@ -49,6 +49,7 @@
 +#endif
  	.open =		snd_mixer_oss_open,
  	.release =	snd_mixer_oss_release,
+ 	.llseek =	no_llseek,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
  	.unlocked_ioctl =	snd_mixer_oss_ioctl,
  	.compat_ioctl =	snd_mixer_oss_ioctl_compat,
diff --git a/acore/oss/pcm_oss.patch b/acore/oss/pcm_oss.patch
index ea2b5d211..4c8666c95 100644
--- a/acore/oss/pcm_oss.patch
+++ b/acore/oss/pcm_oss.patch
@@ -1,5 +1,5 @@
---- ../../../alsa-kmirror/core/oss/pcm_oss.c	2009-04-08 12:30:58.000000000 +0200
-+++ pcm_oss.c	2009-04-08 16:08:18.000000000 +0200
+--- ../../alsa-kernel/core/oss/pcm_oss.c	2010-04-13 12:01:49.084966034 +0200
++++ pcm_oss.c	2010-04-13 13:10:22.969200644 +0200
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
@@ -13,7 +13,7 @@
  #include <linux/slab.h>
  #include <linux/time.h>
  #include <linux/vmalloc.h>
-@@ -1903,9 +1905,13 @@ static int snd_pcm_oss_set_fragment(stru
+@@ -1913,9 +1915,13 @@
  
  static int snd_pcm_oss_nonblock(struct file * file)
  {
@@ -27,7 +27,7 @@
  	return 0;
  }
  
-@@ -2617,13 +2623,26 @@ static long snd_pcm_oss_ioctl(struct fil
+@@ -2634,13 +2640,26 @@
  	return -EINVAL;
  }
  
@@ -55,7 +55,7 @@
  static ssize_t snd_pcm_oss_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
  {
  	struct snd_pcm_oss_file *pcm_oss_file;
-@@ -2656,8 +2675,14 @@ static ssize_t snd_pcm_oss_write(struct
+@@ -2673,8 +2692,14 @@
  	substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK];
  	if (substream == NULL)
  		return -ENXIO;
@@ -70,7 +70,7 @@
  #ifdef OSS_DEBUG
  	printk(KERN_DEBUG "pcm_oss: write %li bytes (wrote %li bytes)\n",
  	       (long)count, (long)result);
-@@ -2774,7 +2799,11 @@ static int snd_pcm_oss_mmap(struct file
+@@ -2795,7 +2820,11 @@
  		return -EIO;
  #endif
  
@@ -82,7 +82,7 @@
  		return -EINVAL;
  
  	err = snd_pcm_mmap_data(substream, file, area);
-@@ -2954,14 +2983,20 @@ static void snd_pcm_oss_proc_done(struct
+@@ -2976,15 +3005,21 @@
  
  static const struct file_operations snd_pcm_oss_f_reg =
  {
@@ -93,6 +93,7 @@
  	.write =	snd_pcm_oss_write,
  	.open =		snd_pcm_oss_open,
  	.release =	snd_pcm_oss_release,
+ 	.llseek =	no_llseek,
  	.poll =		snd_pcm_oss_poll,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
  	.unlocked_ioctl =	snd_pcm_oss_ioctl,
@@ -103,7 +104,7 @@
  	.mmap =		snd_pcm_oss_mmap,
  };
  
-@@ -3075,3 +3110,5 @@ static void __exit alsa_pcm_oss_exit(voi
+@@ -3098,3 +3133,5 @@
  
  module_init(alsa_pcm_oss_init)
  module_exit(alsa_pcm_oss_exit)
diff --git a/acore/pcm_native.patch b/acore/pcm_native.patch
index acef0c95e..939daea9b 100644
--- a/acore/pcm_native.patch
+++ b/acore/pcm_native.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/pcm_native.c	2010-03-10 09:06:46.035772832 +0100
-+++ pcm_native.c	2010-03-10 09:13:01.287272310 +0100
+--- ../alsa-kernel/core/pcm_native.c	2010-04-13 12:01:49.316965755 +0200
++++ pcm_native.c	2010-04-13 13:02:27.280928480 +0200
 @@ -1,3 +1,5 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
@@ -41,7 +41,7 @@
  	if (!S_ISCHR(inode->i_mode) ||
  	    imajor(inode) != snd_major) {
  		fput(file);
-@@ -2830,25 +2839,50 @@
+@@ -2834,25 +2843,50 @@
  	struct snd_pcm_runtime *runtime;
  	snd_pcm_sframes_t result;
  
@@ -99,7 +99,7 @@
  {
  	struct snd_pcm_file *pcm_file;
  	struct snd_pcm_substream *substream;
-@@ -2858,7 +2892,11 @@
+@@ -2862,7 +2896,11 @@
  	void __user **bufs;
  	snd_pcm_uframes_t frames;
  
@@ -111,7 +111,7 @@
  	substream = pcm_file->substream;
  	if (PCM_RUNTIME_CHECK(substream))
  		return -ENXIO;
-@@ -2882,8 +2920,13 @@
+@@ -2886,8 +2924,13 @@
  	return result;
  }
  
@@ -125,7 +125,7 @@
  {
  	struct snd_pcm_file *pcm_file;
  	struct snd_pcm_substream *substream;
-@@ -2893,7 +2936,11 @@
+@@ -2897,7 +2940,11 @@
  	void __user **bufs;
  	snd_pcm_uframes_t frames;
  
@@ -137,7 +137,7 @@
  	substream = pcm_file->substream;
  	if (PCM_RUNTIME_CHECK(substream))
  		return -ENXIO;
-@@ -2915,6 +2962,7 @@
+@@ -2919,6 +2966,7 @@
  	kfree(bufs);
  	return result;
  }
@@ -145,7 +145,7 @@
  
  static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait)
  {
-@@ -3002,6 +3050,22 @@
+@@ -3006,6 +3054,22 @@
   * mmap support
   */
  
@@ -168,7 +168,7 @@
  /*
   * Only on coherent architectures, we can mmap the status and the control records
   * for effcient data transfer.  On others, we have to use HWSYNC ioctl...
-@@ -3010,6 +3074,7 @@
+@@ -3014,6 +3078,7 @@
  /*
   * mmap status record
   */
@@ -176,7 +176,7 @@
  static int snd_pcm_mmap_status_fault(struct vm_area_struct *area,
  						struct vm_fault *vmf)
  {
-@@ -3023,10 +3088,49 @@
+@@ -3027,10 +3092,49 @@
  	get_page(vmf->page);
  	return 0;
  }
@@ -226,7 +226,7 @@
  };
  
  static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,
-@@ -3041,7 +3145,11 @@
+@@ -3045,7 +3149,11 @@
  	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)))
  		return -EINVAL;
  	area->vm_ops = &snd_pcm_vm_ops_status;
@@ -238,7 +238,7 @@
  	area->vm_flags |= VM_RESERVED;
  	return 0;
  }
-@@ -3049,6 +3157,7 @@
+@@ -3053,6 +3161,7 @@
  /*
   * mmap control record
   */
@@ -246,7 +246,7 @@
  static int snd_pcm_mmap_control_fault(struct vm_area_struct *area,
  						struct vm_fault *vmf)
  {
-@@ -3062,10 +3171,50 @@
+@@ -3066,10 +3175,50 @@
  	get_page(vmf->page);
  	return 0;
  }
@@ -297,7 +297,7 @@
  };
  
  static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file *file,
-@@ -3080,7 +3229,11 @@
+@@ -3084,7 +3233,11 @@
  	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)))
  		return -EINVAL;
  	area->vm_ops = &snd_pcm_vm_ops_control;
@@ -309,7 +309,7 @@
  	area->vm_flags |= VM_RESERVED;
  	return 0;
  }
-@@ -3121,9 +3274,16 @@
+@@ -3125,9 +3278,16 @@
  	return virt_to_page(vaddr);
  }
  
@@ -326,7 +326,7 @@
  static int snd_pcm_mmap_data_fault(struct vm_area_struct *area,
  						struct vm_fault *vmf)
  {
-@@ -3150,6 +3310,59 @@
+@@ -3154,6 +3314,59 @@
  	vmf->page = page;
  	return 0;
  }
@@ -386,7 +386,7 @@
  
  static const struct vm_operations_struct snd_pcm_vm_ops_data = {
  	.open =		snd_pcm_mmap_data_open,
-@@ -3159,7 +3372,14 @@
+@@ -3163,7 +3376,14 @@
  static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {
  	.open =		snd_pcm_mmap_data_open,
  	.close =	snd_pcm_mmap_data_close,
@@ -401,7 +401,7 @@
  };
  
  #ifndef ARCH_HAS_DMA_MMAP_COHERENT
-@@ -3203,11 +3423,26 @@
+@@ -3207,11 +3427,26 @@
  	area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
  	area->vm_flags |= VM_IO;
  	size = area->vm_end - area->vm_start;
@@ -429,7 +429,7 @@
  	return 0;
  }
  
-@@ -3251,7 +3486,7 @@
+@@ -3255,7 +3490,7 @@
  	    runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
  		return -EINVAL;
  	size = area->vm_end - area->vm_start;
@@ -438,7 +438,7 @@
  	dma_bytes = PAGE_ALIGN(runtime->dma_bytes);
  	if ((size_t)size > dma_bytes)
  		return -EINVAL;
-@@ -3259,7 +3494,11 @@
+@@ -3263,7 +3498,11 @@
  		return -EINVAL;
  
  	area->vm_ops = &snd_pcm_vm_ops_data;
@@ -450,7 +450,7 @@
  	if (substream->ops->mmap)
  		err = substream->ops->mmap(substream, area);
  	else
-@@ -3282,7 +3521,7 @@
+@@ -3286,7 +3525,7 @@
  	if (PCM_RUNTIME_CHECK(substream))
  		return -ENXIO;
  
@@ -459,7 +459,7 @@
  	switch (offset) {
  	case SNDRV_PCM_MMAP_OFFSET_STATUS:
  		if (pcm_file->no_compat_mmap)
-@@ -3320,12 +3559,34 @@
+@@ -3319,12 +3558,34 @@
  /*
   * ioctl32 compat
   */
@@ -495,7 +495,7 @@
  /*
   *  To be removed helpers to keep binary compatibility
   */
-@@ -3464,29 +3725,53 @@
+@@ -3463,31 +3724,55 @@
  
  const struct file_operations snd_pcm_f_ops[2] = {
  	{
@@ -510,6 +510,7 @@
 +#endif
  		.open =			snd_pcm_playback_open,
  		.release =		snd_pcm_release,
+ 		.llseek =		no_llseek,
  		.poll =			snd_pcm_playback_poll,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
  		.unlocked_ioctl =	snd_pcm_playback_ioctl,
@@ -535,6 +536,7 @@
 +#endif
  		.open =			snd_pcm_capture_open,
  		.release =		snd_pcm_release,
+ 		.llseek =		no_llseek,
  		.poll =			snd_pcm_capture_poll,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
  		.unlocked_ioctl =	snd_pcm_capture_ioctl,
diff --git a/acore/rawmidi.patch b/acore/rawmidi.patch
index ffe716c80..dad0ac58f 100644
--- a/acore/rawmidi.patch
+++ b/acore/rawmidi.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/rawmidi.c	2009-12-15 22:08:58.000000000 +0100
-+++ rawmidi.c	2009-12-15 22:25:55.000000000 +0100
+--- ../alsa-kernel/core/rawmidi.c	2010-04-13 12:01:49.084966034 +0200
++++ rawmidi.c	2010-04-13 13:04:40.000999370 +0200
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
@@ -13,7 +13,7 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
  #include <linux/time.h>
-@@ -1257,6 +1259,9 @@
+@@ -1261,6 +1263,9 @@
  			break;
  		count -= count1;
  	}
@@ -23,7 +23,7 @@
  	if (file->f_flags & O_DSYNC) {
  		spin_lock_irq(&runtime->lock);
  		while (runtime->avail != runtime->buffer_size) {
-@@ -1309,12 +1314,25 @@
+@@ -1313,12 +1318,25 @@
  
  /*
   */
@@ -50,7 +50,7 @@
  /*
  
   */
-@@ -1386,14 +1404,20 @@
+@@ -1390,15 +1408,21 @@
  
  static const struct file_operations snd_rawmidi_f_ops =
  {
@@ -61,6 +61,7 @@
  	.write =	snd_rawmidi_write,
  	.open =		snd_rawmidi_open,
  	.release =	snd_rawmidi_release,
+ 	.llseek =	no_llseek,
  	.poll =		snd_rawmidi_poll,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
  	.unlocked_ioctl =	snd_rawmidi_ioctl,
diff --git a/acore/seq/seq_clientmgr.patch b/acore/seq/seq_clientmgr.patch
index f03506de8..f97de90b4 100644
--- a/acore/seq/seq_clientmgr.patch
+++ b/acore/seq/seq_clientmgr.patch
@@ -1,5 +1,5 @@
---- ../../alsa-kernel/core/seq/seq_clientmgr.c	2007-12-20 10:19:43.000000000 +0100
-+++ seq_clientmgr.c	2007-12-20 10:51:34.000000000 +0100
+--- ../../alsa-kernel/core/seq/seq_clientmgr.c	2010-04-13 12:01:49.084966034 +0200
++++ seq_clientmgr.c	2010-04-13 13:11:27.005575952 +0200
 @@ -1,3 +1,5 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
@@ -14,7 +14,7 @@
  #include <linux/slab.h>
  #include <sound/core.h>
  #include <sound/minors.h>
-@@ -2200,12 +2203,25 @@
+@@ -2211,12 +2214,25 @@
  	return snd_seq_do_ioctl(client, cmd, (void __user *) arg);
  }
  
@@ -41,7 +41,7 @@
  /* -------------------------------------------------------- */
  
  
-@@ -2535,14 +2551,20 @@
+@@ -2550,15 +2566,21 @@
  
  static const struct file_operations snd_seq_f_ops =
  {
@@ -52,6 +52,7 @@
  	.write =	snd_seq_write,
  	.open =		snd_seq_open,
  	.release =	snd_seq_release,
+ 	.llseek =	no_llseek,
  	.poll =		snd_seq_poll,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
  	.unlocked_ioctl =	snd_seq_ioctl,
diff --git a/acore/timer.patch b/acore/timer.patch
index 049bfc924..5a8c65f16 100644
--- a/acore/timer.patch
+++ b/acore/timer.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/timer.c	2009-09-21 15:57:35.000000000 +0200
-+++ timer.c	2009-12-15 22:17:50.000000000 +0100
+--- ../alsa-kernel/core/timer.c	2010-04-13 12:01:49.084966034 +0200
++++ timer.c	2010-04-13 13:05:39.544700178 +0200
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
@@ -22,7 +22,7 @@
  	.ticks =	10000000L,
  	.start =	snd_timer_s_start,
  	.stop =		snd_timer_s_stop
-@@ -1909,21 +1911,40 @@
+@@ -1914,22 +1916,41 @@
  	return mask;
  }
  
@@ -54,6 +54,7 @@
  	.read =		snd_timer_user_read,
  	.open =		snd_timer_user_open,
  	.release =	snd_timer_user_release,
+ 	.llseek =	no_llseek,
  	.poll =		snd_timer_user_poll,
 +#ifdef CONFIG_SND_HAVE_NEW_IOCTL
  	.unlocked_ioctl =	snd_timer_user_ioctl,
@@ -64,7 +65,7 @@
  	.fasync = 	snd_timer_user_fasync,
  };
  
-@@ -1935,6 +1956,7 @@
+@@ -1941,6 +1962,7 @@
  {
  	int err;