wok rev 15743

linux: update modules.list
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 02 15:04:05 2014 +0100 (2014-01-02)
parents 7e7990e7744e
children 67aa716192dd
files busybox/stuff/busybox-1.22-diet.u busybox/stuff/busybox-1.22-diff.u busybox/stuff/busybox-1.22-tar.u busybox/stuff/busybox-1.22-zmodules.u linux/receipt linux/stuff/aufs3-base.patch linux/stuff/aufs3-loopback.patch linux/stuff/aufs3-mmap.patch linux/stuff/aufs3-standalone.patch linux/stuff/channel-negative-one-maxim.patch linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch linux/stuff/modules.list
line diff
     1.1 --- a/busybox/stuff/busybox-1.22-diet.u	Thu Jan 02 14:50:15 2014 +0100
     1.2 +++ b/busybox/stuff/busybox-1.22-diet.u	Thu Jan 02 15:04:05 2014 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  --- busybox-1.21.1/include/platform.h
     1.5  +++ busybox-1.21.1/include/platform.h
     1.6 -@@ -453,6 +453,20 @@
     1.7 +@@ -456,6 +456,20 @@
     1.8   # undef HAVE_NET_ETHERNET_H
     1.9   #endif
    1.10   
     2.1 --- a/busybox/stuff/busybox-1.22-diff.u	Thu Jan 02 14:50:15 2014 +0100
     2.2 +++ b/busybox/stuff/busybox-1.22-diff.u	Thu Jan 02 15:04:05 2014 +0100
     2.3 @@ -1,6 +1,6 @@
     2.4  --- busybox-1.20.0/editors/diff.c
     2.5  +++ busybox-1.20.0/editors/diff.c
     2.6 -@@ -729,6 +729,14 @@
     2.7 +@@ -756,6 +756,14 @@
     2.8   		j = fread(buf1, 1, sz, fp[1]);
     2.9   		if (i != j) {
    2.10   			differ = true;
     3.1 --- a/busybox/stuff/busybox-1.22-tar.u	Thu Jan 02 14:50:15 2014 +0100
     3.2 +++ b/busybox/stuff/busybox-1.22-tar.u	Thu Jan 02 15:04:05 2014 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  Accept and ignore --wildcards argument
     3.5  --- busybox-1.21.0/archival/tar.c
     3.6  +++ busybox-1.21.0/archival/tar.c
     3.7 -@@ -846,10 +846,12 @@
     3.8 +@@ -946,10 +946,12 @@
     3.9   # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
    3.10   	"touch\0"               No_argument       "m"
    3.11   # endif
     4.1 --- a/busybox/stuff/busybox-1.22-zmodules.u	Thu Jan 02 14:50:15 2014 +0100
     4.2 +++ b/busybox/stuff/busybox-1.22-zmodules.u	Thu Jan 02 15:04:05 2014 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Add LZMA_DEFAULT_MAGIC support
     4.5  --- busybox-1.20/archival/libarchive/open_transformer.c.ORG
     4.6  +++ busybox-1.20/archival/libarchive/open_transformer.c
     4.7 -@@ -126,6 +126,21 @@
     4.8 +@@ -132,6 +132,21 @@
     4.9   	/* .gz and .bz2 both have 2-byte signature, and their
    4.10   	 * unpack_XXX_stream wants this header skipped. */
    4.11   	xread(fd, magic.b16, sizeof(magic.b16[0]));
     5.1 --- a/linux/receipt	Thu Jan 02 14:50:15 2014 +0100
     5.2 +++ b/linux/receipt	Thu Jan 02 15:04:05 2014 +0100
     5.3 @@ -68,7 +68,9 @@
     5.4  			#xzcat $SRC/$(basename $PATCH) | patch -Np1 >/dev/null
     5.5  			patch -Np1 < $stuff/$ARCH/linux-arm.patch || exit 1
     5.6  			cp -f $stuff/$ARCH/linux-arm.config .config
     5.7 +			echo "Configure $ARCH kernel..."
     5.8  			yes '' | make ARCH=$ARCH oldconfig
     5.9 +			echo "Build $ARCH kernel..."
    5.10  			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- bzImage &&
    5.11  			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- modules &&
    5.12  			make ARCH=$ARCH CROSS_COMPILE=${HOST_SYSTEM}- \
    5.13 @@ -176,7 +178,9 @@
    5.14  	sed -i -e 's/^CONFIG_RTL8192/#&/' \
    5.15  	       -e 's/^CONFIG_R8187SE/#&/' \
    5.16  	       -e 's/^CONFIG_RT2870/#&/' .config
    5.17 +	echo "Configure bzImage64 without modules..."
    5.18  	yes '' | make ARCH=x86_64 oldconfig
    5.19 +	echo "Build bzImage64 without modules..."
    5.20  	if [ -x /usr/bin/cook ]; then
    5.21  		make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage || exit 1
    5.22  	elif [ -x /usr/bin/tazwok ]; then
    5.23 @@ -190,7 +194,9 @@
    5.24  
    5.25  	# Build bzImage64 with modules
    5.26  	cp -f $stuff/$PACKAGE-slitaz.config64 .config
    5.27 +	echo "Configure bzImage64 with modules..."
    5.28  	yes '' | make ARCH=x86_64 oldconfig
    5.29 +	echo "Build bzImage64 with modules..."
    5.30  	make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage &&
    5.31  	make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- modules &&
    5.32  	make ARCH=x86_64 INSTALL_MOD_PATH=$DESTDIR/linux64 modules_install &&
    5.33 @@ -221,7 +227,9 @@
    5.34  	sed -i -e 's/^CONFIG_RTL8192/#&/' \
    5.35  	       -e 's/^CONFIG_R8187SE/#&/' \
    5.36  	       -e 's/^CONFIG_RT2870/#&/' .config
    5.37 +	echo "Configure bzImage without modules..."
    5.38  	yes '' | make ARCH=i386 oldconfig
    5.39 +	echo "Build bzImage without modules..."
    5.40  	if [ -x /usr/bin/cook ]; then
    5.41  		make ARCH=i386 -j 4 bzImage || exit 1
    5.42  	elif [ -x /usr/bin/tazwok ]; then
    5.43 @@ -235,8 +243,10 @@
    5.44  
    5.45  	# Build bzImage with modules
    5.46  	cp -f $stuff/$PACKAGE-slitaz.config .config
    5.47 +	echo "Configure bzImage with modules..."
    5.48  	yes '' | make ARCH=i386 oldconfig
    5.49  	ln .config $WOK/$PACKAGE/source/slitaz/config
    5.50 +	echo "Build bzImage with modules..."
    5.51  	make ARCH=i386 -j 4 bzImage &&
    5.52  	make ARCH=i386 -j 4 modules &&
    5.53  	make ARCH=i386 INSTALL_MOD_PATH=$DESTDIR modules_install &&
     6.1 --- a/linux/stuff/aufs3-base.patch	Thu Jan 02 14:50:15 2014 +0100
     6.2 +++ b/linux/stuff/aufs3-base.patch	Thu Jan 02 15:04:05 2014 +0100
     6.3 @@ -4,7 +4,7 @@
     6.4  index 5008f01..4cc94cf 100644
     6.5  --- a/fs/namei.c
     6.6  +++ b/fs/namei.c
     6.7 -@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
     6.8 +@@ -1755,7 +1755,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
     6.9    * needs parent already locked. Doesn't follow mounts.
    6.10    * SMP-safe.
    6.11    */
    6.12 @@ -17,7 +17,7 @@
    6.13  index fa2defa..e3569b0 100644
    6.14  --- a/fs/splice.c
    6.15  +++ b/fs/splice.c
    6.16 -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
    6.17 +@@ -1094,8 +1094,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
    6.18   /*
    6.19    * Attempt to initiate a splice from pipe to file.
    6.20    */
    6.21 @@ -28,7 +28,7 @@
    6.22   {
    6.23   	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
    6.24   				loff_t *, size_t, unsigned int);
    6.25 -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    6.26 +@@ -1122,9 +1122,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    6.27   /*
    6.28    * Attempt to initiate a splice from a file to a pipe.
    6.29    */
     7.1 --- a/linux/stuff/aufs3-loopback.patch	Thu Jan 02 14:50:15 2014 +0100
     7.2 +++ b/linux/stuff/aufs3-loopback.patch	Thu Jan 02 15:04:05 2014 +0100
     7.3 @@ -140,7 +140,7 @@
     7.4   	lo->transfer = transfer_none;
     7.5   	lo->ioctl = NULL;
     7.6   	lo->lo_sizelimit = 0;
     7.7 -@@ -914,6 +943,7 @@ out_clr:
     7.8 +@@ -919,6 +948,7 @@ out_clr:
     7.9   	lo->lo_thread = NULL;
    7.10   	lo->lo_device = NULL;
    7.11   	lo->lo_backing_file = NULL;
    7.12 @@ -148,7 +148,7 @@
    7.13   	lo->lo_flags = 0;
    7.14   	set_capacity(lo->lo_disk, 0);
    7.15   	invalidate_bdev(bdev);
    7.16 -@@ -923,6 +953,8 @@ out_clr:
    7.17 +@@ -928,6 +958,8 @@ out_clr:
    7.18   	lo->lo_state = Lo_unbound;
    7.19    out_putf:
    7.20   	fput(file);
    7.21 @@ -157,7 +157,7 @@
    7.22    out:
    7.23   	/* This is safe: open() is still holding a reference. */
    7.24   	module_put(THIS_MODULE);
    7.25 -@@ -969,6 +1001,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
    7.26 +@@ -974,6 +1006,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
    7.27   static int loop_clr_fd(struct loop_device *lo)
    7.28   {
    7.29   	struct file *filp = lo->lo_backing_file;
    7.30 @@ -165,7 +165,7 @@
    7.31   	gfp_t gfp = lo->old_gfp_mask;
    7.32   	struct block_device *bdev = lo->lo_device;
    7.33   
    7.34 -@@ -989,6 +1022,7 @@ static int loop_clr_fd(struct loop_device *lo)
    7.35 +@@ -994,6 +1027,7 @@ static int loop_clr_fd(struct loop_device *lo)
    7.36   
    7.37   	spin_lock_irq(&lo->lo_lock);
    7.38   	lo->lo_backing_file = NULL;
    7.39 @@ -173,7 +173,7 @@
    7.40   	spin_unlock_irq(&lo->lo_lock);
    7.41   
    7.42   	loop_release_xfer(lo);
    7.43 -@@ -1029,6 +1063,8 @@ static int loop_clr_fd(struct loop_device *lo)
    7.44 +@@ -1036,6 +1070,8 @@ static int loop_clr_fd(struct loop_device *lo)
    7.45   	 * bd_mutex which is usually taken before lo_ctl_mutex.
    7.46   	 */
    7.47   	fput(filp);
    7.48 @@ -261,7 +261,7 @@
    7.49  index e0bc4ff..bd7b3a4 100644
    7.50  --- a/include/linux/fs.h
    7.51  +++ b/include/linux/fs.h
    7.52 -@@ -1683,6 +1683,10 @@ struct super_operations {
    7.53 +@@ -1699,6 +1699,10 @@ struct super_operations {
    7.54   	int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
    7.55   	int (*nr_cached_objects)(struct super_block *);
    7.56   	void (*free_cached_objects)(struct super_block *, int);
     8.1 --- a/linux/stuff/aufs3-mmap.patch	Thu Jan 02 14:50:15 2014 +0100
     8.2 +++ b/linux/stuff/aufs3-mmap.patch	Thu Jan 02 15:04:05 2014 +0100
     8.3 @@ -30,7 +30,7 @@
     8.4   		dev = inode->i_sb->s_dev;
     8.5   		ino = inode->i_ino;
     8.6   		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
     8.7 -@@ -1032,6 +1034,7 @@ static int show_numa_map(struct seq_file *m, void *v)
     8.8 +@@ -1044,6 +1046,7 @@ static int show_numa_map(struct seq_file *m, void *v)
     8.9   	seq_printf(m, "%08lx %s", vma->vm_start, buffer);
    8.10   
    8.11   	if (file) {
    8.12 @@ -67,7 +67,7 @@
    8.13   
    8.14   struct mempolicy;
    8.15   struct anon_vma;
    8.16 -@@ -983,6 +986,87 @@ static inline int fixup_user_fault(struct task_struct *tsk,
    8.17 +@@ -984,6 +987,87 @@ static inline int fixup_user_fault(struct task_struct *tsk,
    8.18   }
    8.19   #endif
    8.20   
    8.21 @@ -179,7 +179,7 @@
    8.22  index da4a6a1..4a31675 100644
    8.23  --- a/kernel/fork.c
    8.24  +++ b/kernel/fork.c
    8.25 -@@ -375,7 +375,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
    8.26 +@@ -378,7 +378,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
    8.27   			struct inode *inode = file->f_path.dentry->d_inode;
    8.28   			struct address_space *mapping = file->f_mapping;
    8.29   
    8.30 @@ -209,7 +209,7 @@
    8.31  index 829d437..6c6f9f1 100644
    8.32  --- a/mm/memory.c
    8.33  +++ b/mm/memory.c
    8.34 -@@ -2621,7 +2621,7 @@ reuse:
    8.35 +@@ -2684,7 +2684,7 @@ reuse:
    8.36   
    8.37   		/* file_update_time outside page_lock */
    8.38   		if (vma->vm_file)
    8.39 @@ -218,7 +218,7 @@
    8.40   
    8.41   		return ret;
    8.42   	}
    8.43 -@@ -3306,7 +3306,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
    8.44 +@@ -3369,7 +3369,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
    8.45   
    8.46   		/* file_update_time outside page_lock */
    8.47   		if (vma->vm_file)
    8.48 @@ -316,7 +316,7 @@
    8.49   
    8.50   		/* IO memory and memory shared directly out of the pagecache
    8.51   		 * from ramfs/tmpfs mustn't be released here */
    8.52 -@@ -788,7 +788,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
    8.53 +@@ -790,7 +790,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
    8.54   	if (vma->vm_ops && vma->vm_ops->close)
    8.55   		vma->vm_ops->close(vma);
    8.56   	if (vma->vm_file) {
    8.57 @@ -325,7 +325,7 @@
    8.58   		if (vma->vm_flags & VM_EXECUTABLE)
    8.59   			removed_exe_file_vma(mm);
    8.60   	}
    8.61 -@@ -1361,7 +1361,7 @@ unsigned long do_mmap_pgoff(struct file *file,
    8.62 +@@ -1363,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file,
    8.63   					goto error_just_free;
    8.64   				}
    8.65   			}
    8.66 @@ -334,7 +334,7 @@
    8.67   			kmem_cache_free(vm_region_jar, region);
    8.68   			region = pregion;
    8.69   			result = start;
    8.70 -@@ -1437,10 +1437,10 @@ error_just_free:
    8.71 +@@ -1439,10 +1439,10 @@ error_just_free:
    8.72   	up_write(&nommu_region_sem);
    8.73   error:
    8.74   	if (region->vm_file)
     9.1 --- a/linux/stuff/aufs3-standalone.patch	Thu Jan 02 14:50:15 2014 +0100
     9.2 +++ b/linux/stuff/aufs3-standalone.patch	Thu Jan 02 15:04:05 2014 +0100
     9.3 @@ -29,7 +29,7 @@
     9.4  index 4cc94cf..af19e30 100644
     9.5  --- a/fs/namei.c
     9.6  +++ b/fs/namei.c
     9.7 -@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
     9.8 +@@ -1759,6 +1759,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
     9.9   {
    9.10   	return __lookup_hash(&nd->last, nd->path.dentry, nd);
    9.11   }
    9.12 @@ -41,7 +41,7 @@
    9.13  index cfc6d44..173d15a 100644
    9.14  --- a/fs/namespace.c
    9.15  +++ b/fs/namespace.c
    9.16 -@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
    9.17 +@@ -1507,6 +1507,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
    9.18   	}
    9.19   	return 0;
    9.20   }
    9.21 @@ -86,7 +86,7 @@
    9.22   
    9.23   /*
    9.24    * Any time a mark is getting freed we end up here.
    9.25 -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
    9.26 +@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
    9.27   	if (unlikely(atomic_dec_and_test(&group->num_marks)))
    9.28   		fsnotify_final_destroy_group(group);
    9.29   }
    9.30 @@ -94,7 +94,7 @@
    9.31   
    9.32   void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
    9.33   {
    9.34 -@@ -276,6 +278,7 @@ err:
    9.35 +@@ -278,6 +280,7 @@ err:
    9.36   
    9.37   	return ret;
    9.38   }
    9.39 @@ -102,7 +102,7 @@
    9.40   
    9.41   /*
    9.42    * clear any marks in a group in which mark->flags & flags is true
    9.43 -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
    9.44 +@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
    9.45   	atomic_set(&mark->refcnt, 1);
    9.46   	mark->free_mark = free_mark;
    9.47   }
    9.48 @@ -126,7 +126,7 @@
    9.49  index e3569b0..9dc07b7 100644
    9.50  --- a/fs/splice.c
    9.51  +++ b/fs/splice.c
    9.52 -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    9.53 +@@ -1118,6 +1118,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
    9.54   
    9.55   	return splice_write(pipe, out, ppos, len, flags);
    9.56   }
    9.57 @@ -134,7 +134,7 @@
    9.58   
    9.59   /*
    9.60    * Attempt to initiate a splice from a file to a pipe.
    9.61 -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
    9.62 +@@ -1144,6 +1145,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
    9.63   
    9.64   	return splice_read(in, ppos, pipe, len, flags);
    9.65   }
    9.66 @@ -146,7 +146,7 @@
    9.67  index ee4f848..611fd70 100644
    9.68  --- a/security/commoncap.c
    9.69  +++ b/security/commoncap.c
    9.70 -@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
    9.71 +@@ -981,3 +981,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
    9.72   	}
    9.73   	return ret;
    9.74   }
    10.1 --- a/linux/stuff/channel-negative-one-maxim.patch	Thu Jan 02 14:50:15 2014 +0100
    10.2 +++ b/linux/stuff/channel-negative-one-maxim.patch	Thu Jan 02 15:04:05 2014 +0100
    10.3 @@ -12,7 +12,7 @@
    10.4  index b01a6f6..09d979b 100644
    10.5  --- a/net/wireless/chan.c
    10.6  +++ b/net/wireless/chan.c
    10.7 -@@ -49,9 +49,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
    10.8 +@@ -82,9 +82,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
    10.9   {
   10.10   	struct ieee80211_channel *chan;
   10.11   	int result;
   10.12 @@ -26,7 +26,7 @@
   10.13   
   10.14   	if (wdev) {
   10.15   		ASSERT_WDEV_LOCK(wdev);
   10.16 -@@ -76,5 +79,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
   10.17 +@@ -131,5 +134,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
   10.18   	if (wdev)
   10.19   		wdev->channel = chan;
   10.20   
    11.1 --- a/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch	Thu Jan 02 14:50:15 2014 +0100
    11.2 +++ b/linux/stuff/mac80211.compat08082009.wl_frag+ack_v1.patch	Thu Jan 02 15:04:05 2014 +0100
    11.3 @@ -2,7 +2,7 @@
    11.4  index 0855cac..221bed6 100644
    11.5  --- a/net/mac80211/tx.c
    11.6  +++ b/net/mac80211/tx.c
    11.7 -@@ -677,11 +677,19 @@ int tid;
    11.8 +@@ -792,11 +792,19 @@ int tid;
    11.9   
   11.10   	/*
   11.11   	 * Packet injection may want to control the sequence
    12.1 --- a/linux/stuff/modules.list	Thu Jan 02 14:50:15 2014 +0100
    12.2 +++ b/linux/stuff/modules.list	Thu Jan 02 15:04:05 2014 +0100
    12.3 @@ -1,3 +1,5 @@
    12.4 +arch/x86/kernel/msr.ko.xz
    12.5 +arch/x86/kernel/microcode.ko.xz
    12.6  drivers/acpi/video.ko.xz
    12.7  drivers/acpi/button.ko.xz
    12.8  drivers/char/genrtc.ko.xz