# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1388671445 -3600
# Node ID a1084fda7f235a60ddb7d0e0d4ca7627a3a8b7ea
# Parent  7e7990e7744ec42834c0f58d5526ca87b91f01d1
linux: update modules.list

diff -r 7e7990e7744e -r a1084fda7f23 busybox/stuff/busybox-1.22-diet.u
--- a/busybox/stuff/busybox-1.22-diet.u	Thu Jan 02 14:50:15 2014 +0100
+++ b/busybox/stuff/busybox-1.22-diet.u	Thu Jan 02 15:04:05 2014 +0100
@@ -1,6 +1,6 @@
 --- busybox-1.21.1/include/platform.h
 +++ busybox-1.21.1/include/platform.h
-@@ -453,6 +453,20 @@
+@@ -456,6 +456,20 @@
  # undef HAVE_NET_ETHERNET_H
  #endif
  
diff -r 7e7990e7744e -r a1084fda7f23 busybox/stuff/busybox-1.22-diff.u
--- a/busybox/stuff/busybox-1.22-diff.u	Thu Jan 02 14:50:15 2014 +0100
+++ b/busybox/stuff/busybox-1.22-diff.u	Thu Jan 02 15:04:05 2014 +0100
@@ -1,6 +1,6 @@
 --- busybox-1.20.0/editors/diff.c
 +++ busybox-1.20.0/editors/diff.c
-@@ -729,6 +729,14 @@
+@@ -756,6 +756,14 @@
  		j = fread(buf1, 1, sz, fp[1]);
  		if (i != j) {
  			differ = true;
diff -r 7e7990e7744e -r a1084fda7f23 busybox/stuff/busybox-1.22-tar.u
--- a/busybox/stuff/busybox-1.22-tar.u	Thu Jan 02 14:50:15 2014 +0100
+++ b/busybox/stuff/busybox-1.22-tar.u	Thu Jan 02 15:04:05 2014 +0100
@@ -1,7 +1,7 @@
 Accept and ignore --wildcards argument
 --- busybox-1.21.0/archival/tar.c
 +++ busybox-1.21.0/archival/tar.c
-@@ -846,10 +846,12 @@
+@@ -946,10 +946,12 @@
  # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
  	"touch\0"               No_argument       "m"
  # endif
diff -r 7e7990e7744e -r a1084fda7f23 busybox/stuff/busybox-1.22-zmodules.u
--- a/busybox/stuff/busybox-1.22-zmodules.u	Thu Jan 02 14:50:15 2014 +0100
+++ b/busybox/stuff/busybox-1.22-zmodules.u	Thu Jan 02 15:04:05 2014 +0100
@@ -1,7 +1,7 @@
 Add LZMA_DEFAULT_MAGIC support
 --- busybox-1.20/archival/libarchive/open_transformer.c.ORG
 +++ busybox-1.20/archival/libarchive/open_transformer.c
-@@ -126,6 +126,21 @@
+@@ -132,6 +132,21 @@
  	/* .gz and .bz2 both have 2-byte signature, and their
  	 * unpack_XXX_stream wants this header skipped. */
  	xread(fd, magic.b16, sizeof(magic.b16[0]));
diff -r 7e7990e7744e -r a1084fda7f23 linux/receipt
--- a/linux/receipt	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/receipt	Thu Jan 02 15:04:05 2014 +0100
@@ -68,7 +68,9 @@
 			#xzcat $SRC/$(basename $PATCH) | patch -Np1 >/dev/null
 			patch -Np1 < $stuff/$ARCH/linux-arm.patch || exit 1
 			cp -f $stuff/$ARCH/linux-arm.config .config
+			echo "Configure $ARCH kernel..."
 			yes '' | make ARCH=$ARCH oldconfig
+			echo "Build $ARCH kernel..."
 			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- bzImage &&
 			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- modules &&
 			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- \
@@ -176,7 +178,9 @@
 	sed -i -e 's/^CONFIG_RTL8192/#&/' \
 	       -e 's/^CONFIG_R8187SE/#&/' \
 	       -e 's/^CONFIG_RT2870/#&/' .config
+	echo "Configure bzImage64 without modules..."
 	yes '' | make ARCH=x86_64 oldconfig
+	echo "Build bzImage64 without modules..."
 	if [ -x /usr/bin/cook ]; then
 		make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || exit 1
 	elif [ -x /usr/bin/tazwok ]; then
@@ -190,7 +194,9 @@
 
 	# Build bzImage64 with modules
 	cp -f $stuff/$PACKAGE-slitaz.config64 .config
+	echo "Configure bzImage64 with modules..."
 	yes '' | make ARCH=x86_64 oldconfig
+	echo "Build bzImage64 with modules..."
 	make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage &&
 	make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- modules &&
 	make ARCH=x86_64 INSTALL_MOD_PATH=$DESTDIR/linux64 modules_install &&
@@ -221,7 +227,9 @@
 	sed -i -e 's/^CONFIG_RTL8192/#&/' \
 	       -e 's/^CONFIG_R8187SE/#&/' \
 	       -e 's/^CONFIG_RT2870/#&/' .config
+	echo "Configure bzImage without modules..."
 	yes '' | make ARCH=i386 oldconfig
+	echo "Build bzImage without modules..."
 	if [ -x /usr/bin/cook ]; then
 		make ARCH=i386 -j 4 bzImage || exit 1
 	elif [ -x /usr/bin/tazwok ]; then
@@ -235,8 +243,10 @@
 
 	# Build bzImage with modules
 	cp -f $stuff/$PACKAGE-slitaz.config .config
+	echo "Configure bzImage with modules..."
 	yes '' | make ARCH=i386 oldconfig
 	ln .config $WOK/$PACKAGE/source/slitaz/config
+	echo "Build bzImage with modules..."
 	make ARCH=i386 -j 4 bzImage &&
 	make ARCH=i386 -j 4 modules &&
 	make ARCH=i386 INSTALL_MOD_PATH=$DESTDIR modules_install &&
diff -r 7e7990e7744e -r a1084fda7f23 linux/stuff/aufs3-base.patch
--- a/linux/stuff/aufs3-base.patch	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/stuff/aufs3-base.patch	Thu Jan 02 15:04:05 2014 +0100
@@ -4,7 +4,7 @@
 index 5008f01..4cc94cf 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
+@@ -1755,7 +1755,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -17,7 +17,7 @@
 index fa2defa..e3569b0 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1094,8 +1094,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -28,7 +28,7 @@
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1122,9 +1122,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  /*
   * Attempt to initiate a splice from a file to a pipe.
   */
diff -r 7e7990e7744e -r a1084fda7f23 linux/stuff/aufs3-loopback.patch
--- a/linux/stuff/aufs3-loopback.patch	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/stuff/aufs3-loopback.patch	Thu Jan 02 15:04:05 2014 +0100
@@ -140,7 +140,7 @@
  	lo->transfer = transfer_none;
  	lo->ioctl = NULL;
  	lo->lo_sizelimit = 0;
-@@ -914,6 +943,7 @@ out_clr:
+@@ -919,6 +948,7 @@ out_clr:
  	lo->lo_thread = NULL;
  	lo->lo_device = NULL;
  	lo->lo_backing_file = NULL;
@@ -148,7 +148,7 @@
  	lo->lo_flags = 0;
  	set_capacity(lo->lo_disk, 0);
  	invalidate_bdev(bdev);
-@@ -923,6 +953,8 @@ out_clr:
+@@ -928,6 +958,8 @@ out_clr:
  	lo->lo_state = Lo_unbound;
   out_putf:
  	fput(file);
@@ -157,7 +157,7 @@
   out:
  	/* This is safe: open() is still holding a reference. */
  	module_put(THIS_MODULE);
-@@ -969,6 +1001,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -974,6 +1006,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
  static int loop_clr_fd(struct loop_device *lo)
  {
  	struct file *filp = lo->lo_backing_file;
@@ -165,7 +165,7 @@
  	gfp_t gfp = lo->old_gfp_mask;
  	struct block_device *bdev = lo->lo_device;
  
-@@ -989,6 +1022,7 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -994,6 +1027,7 @@ static int loop_clr_fd(struct loop_device *lo)
  
  	spin_lock_irq(&lo->lo_lock);
  	lo->lo_backing_file = NULL;
@@ -173,7 +173,7 @@
  	spin_unlock_irq(&lo->lo_lock);
  
  	loop_release_xfer(lo);
-@@ -1029,6 +1063,8 @@ static int loop_clr_fd(struct loop_device *lo)
+@@ -1036,6 +1070,8 @@ static int loop_clr_fd(struct loop_device *lo)
  	 * bd_mutex which is usually taken before lo_ctl_mutex.
  	 */
  	fput(filp);
@@ -261,7 +261,7 @@
 index e0bc4ff..bd7b3a4 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1683,6 +1683,10 @@ struct super_operations {
+@@ -1699,6 +1699,10 @@ struct super_operations {
  	int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
  	int (*nr_cached_objects)(struct super_block *);
  	void (*free_cached_objects)(struct super_block *, int);
diff -r 7e7990e7744e -r a1084fda7f23 linux/stuff/aufs3-mmap.patch
--- a/linux/stuff/aufs3-mmap.patch	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/stuff/aufs3-mmap.patch	Thu Jan 02 15:04:05 2014 +0100
@@ -30,7 +30,7 @@
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1032,6 +1034,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1044,6 +1046,7 @@ static int show_numa_map(struct seq_file *m, void *v)
  	seq_printf(m, "%08lx %s", vma->vm_start, buffer);
  
  	if (file) {
@@ -67,7 +67,7 @@
  
  struct mempolicy;
  struct anon_vma;
-@@ -983,6 +986,87 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -984,6 +987,87 @@ static inline int fixup_user_fault(struct task_struct *tsk,
  }
  #endif
  
@@ -179,7 +179,7 @@
 index da4a6a1..4a31675 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -375,7 +375,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -378,7 +378,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  			struct inode *inode = file->f_path.dentry->d_inode;
  			struct address_space *mapping = file->f_mapping;
  
@@ -209,7 +209,7 @@
 index 829d437..6c6f9f1 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -2621,7 +2621,7 @@ reuse:
+@@ -2684,7 +2684,7 @@ reuse:
  
  		/* file_update_time outside page_lock */
  		if (vma->vm_file)
@@ -218,7 +218,7 @@
  
  		return ret;
  	}
-@@ -3306,7 +3306,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3369,7 +3369,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  
  		/* file_update_time outside page_lock */
  		if (vma->vm_file)
@@ -316,7 +316,7 @@
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -788,7 +788,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -790,7 +790,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file) {
@@ -325,7 +325,7 @@
  		if (vma->vm_flags & VM_EXECUTABLE)
  			removed_exe_file_vma(mm);
  	}
-@@ -1361,7 +1361,7 @@ unsigned long do_mmap_pgoff(struct file *file,
+@@ -1363,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -334,7 +334,7 @@
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1437,10 +1437,10 @@ error_just_free:
+@@ -1439,10 +1439,10 @@ error_just_free:
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
diff -r 7e7990e7744e -r a1084fda7f23 linux/stuff/aufs3-standalone.patch
--- a/linux/stuff/aufs3-standalone.patch	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/stuff/aufs3-standalone.patch	Thu Jan 02 15:04:05 2014 +0100
@@ -29,7 +29,7 @@
 index 4cc94cf..af19e30 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1759,6 +1759,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
  {
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
@@ -41,7 +41,7 @@
 index cfc6d44..173d15a 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1507,6 +1507,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -86,7 +86,7 @@
  
  /*
   * Any time a mark is getting freed we end up here.
-@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
+@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
  	if (unlikely(atomic_dec_and_test(&group->num_marks)))
  		fsnotify_final_destroy_group(group);
  }
@@ -94,7 +94,7 @@
  
  void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
  {
-@@ -276,6 +278,7 @@ err:
+@@ -278,6 +280,7 @@ err:
  
  	return ret;
  }
@@ -102,7 +102,7 @@
  
  /*
   * clear any marks in a group in which mark->flags & flags is true
-@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
  	atomic_set(&mark->refcnt, 1);
  	mark->free_mark = free_mark;
  }
@@ -126,7 +126,7 @@
 index e3569b0..9dc07b7 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1118,6 +1118,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -134,7 +134,7 @@
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1144,6 +1145,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -146,7 +146,7 @@
 index ee4f848..611fd70 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
-@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+@@ -981,3 +981,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
  	}
  	return ret;
  }
diff -r 7e7990e7744e -r a1084fda7f23 linux/stuff/channel-negative-one-maxim.patch
--- a/linux/stuff/channel-negative-one-maxim.patch	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/stuff/channel-negative-one-maxim.patch	Thu Jan 02 15:04:05 2014 +0100
@@ -12,7 +12,7 @@
 index b01a6f6..09d979b 100644
 --- a/net/wireless/chan.c
 +++ b/net/wireless/chan.c
-@@ -49,9 +49,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
+@@ -82,9 +82,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
  {
  	struct ieee80211_channel *chan;
  	int result;
@@ -26,7 +26,7 @@
  
  	if (wdev) {
  		ASSERT_WDEV_LOCK(wdev);
-@@ -76,5 +79,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
+@@ -131,5 +134,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
  	if (wdev)
  		wdev->channel = chan;
  
diff -r 7e7990e7744e -r a1084fda7f23 linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch
--- a/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch	Thu Jan 02 15:04:05 2014 +0100
@@ -2,7 +2,7 @@
 index 0855cac..221bed6 100644
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -677,11 +677,19 @@ int tid;
+@@ -792,11 +792,19 @@ int tid;
  
  	/*
  	 * Packet injection may want to control the sequence
diff -r 7e7990e7744e -r a1084fda7f23 linux/stuff/modules.list
--- a/linux/stuff/modules.list	Thu Jan 02 14:50:15 2014 +0100
+++ b/linux/stuff/modules.list	Thu Jan 02 15:04:05 2014 +0100
@@ -1,3 +1,5 @@
+arch/x86/kernel/msr.ko.xz
+arch/x86/kernel/microcode.ko.xz
 drivers/acpi/video.ko.xz
 drivers/acpi/button.ko.xz
 drivers/char/genrtc.ko.xz