Djam/kernel-5.13
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.13.git synced 2025-02-25 08:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to version 5.9.3

Browse source 
Patches:
* fs-aufs.patch - re-diffed, because there seem to be no upstream
updates here yet;
* perf-zstd-use-zu-to-print-size_t-values.patch - no longer needed:
upstream kernel has the fix now.
* disable-mrproper-[...]-in-devel-rpms.patch - a usual re-diff.
This commit is contained in:
Evgenii Shatokhin 2020-11-04 17:30:46 +03:00
parent 3383d6828c
commit 22b55ffc8e
6 changed files with 136 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,3 +1,3 @@
sources:
linux-5.8.tar.xz: 1f52755a5128c1a6719b3294b73c59aa9597937e
patch-5.8.16.xz: ff0efd1dd7cf01200e70c9286a10f83793acae15
linux-5.9.tar.xz: 0617d9e190869ec11f2a28791f2cbd34c250f51b
patch-5.9.3.xz: 8a92083f24ae65c36aac92f2ff5f97fa714bc50c

12
disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
View file

@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index 7932464518f1..17b8a77dc7bc 100644
index 50e927f34853..e85bd4aea3cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1155,8 +1155,7 @@ include/config/kernel.release: FORCE
@@ -1178,8 +1178,7 @@ include/config/kernel.release: FORCE
# Carefully list dependencies so we do not try to build scripts twice
# in parallel
PHONY += scripts
@ -12,16 +12,16 @@ index 7932464518f1..17b8a77dc7bc 100644
# Things we need to do before we recursively start building the kernel
# or the modules are listed in "prepare".
@@ -1175,7 +1174,7 @@ prepare0: archprepare
@@ -1198,7 +1197,7 @@ prepare0: archprepare
$(Q)$(MAKE) $(build)=.
# All the preparing..
-prepare: prepare0 prepare-objtool
-prepare: prepare0 prepare-objtool prepare-resolve_btfids
+prepare:
# Support for using generic headers in asm-generic
asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
@@ -1434,15 +1433,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers \
@@ -1462,15 +1461,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers \
modules.builtin modules.builtin.modinfo modules.nsdeps
# Directories & files removed with 'make mrproper'
@ -38,7 +38,7 @@ index 7932464518f1..17b8a77dc7bc 100644
# Directories & files removed with 'make distclean'
DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
@@ -1462,13 +1453,10 @@ clean: archclean vmlinuxclean
@@ -1490,13 +1481,10 @@ clean: archclean vmlinuxclean
# mrproper - Delete all generated files, including .config
#
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))

120
fs-aufs.patch
View file

@ -1931,10 +1931,10 @@ index 000000000000..d55cae285dff
+Currently this approach is applied to address_space_operations for
+regular files only.
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e2698cc7e23..491f32f3b072 100644
index 867157311dc8..79e2ef54db88 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2984,6 +2984,19 @@ F: include/linux/audit.h
@@ -3027,6 +3027,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
@ -1955,10 +1955,10 @@ index 4e2698cc7e23..491f32f3b072 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 475e1a738560..8d77e68aa52b 100644
index d3394191e168..1bd6045111b1 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -763,6 +763,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -764,6 +764,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
@ -1984,10 +1984,10 @@ index 475e1a738560..8d77e68aa52b 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/Kconfig b/fs/Kconfig
index a88aa3af73c1..0f0caa023fb9 100644
index aa4c12282301..b29bad13b249 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -267,6 +267,7 @@ source "fs/sysv/Kconfig"
@@ -288,6 +288,7 @@ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig"
@ -1996,7 +1996,7 @@ index a88aa3af73c1..0f0caa023fb9 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
index 2ce5112b02c8..d9b4a5198553 100644
index 1c7b0e3f6daa..98594d17a073 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
@ -37972,7 +37972,7 @@ index 000000000000..b3152c0ce0b5
+ return err;
+}
diff --git a/fs/dcache.c b/fs/dcache.c
index 361ea7ab30ea..e6e467c9e86c 100644
index ea0485861d93..30dec552278d 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1285,7 +1285,7 @@ enum d_walk_ret {
@ -38001,10 +38001,10 @@ index 361ea7ab30ea..e6e467c9e86c 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
index e6e8a9a70327..a72a0dbfcc45 100644
index 07910f5032e7..166ae241414f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path)
@@ -112,6 +112,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
@ -38013,7 +38013,7 @@ index e6e8a9a70327..a72a0dbfcc45 100644
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 2e4c0fa2074b..f2c90a416b75 100644
index 19ac5baad50f..b18afdf81e76 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -32,7 +32,7 @@
@ -38100,7 +38100,7 @@ index 72c4c347afb7..749e33422187 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 4a0f600a3328..2b7e1ac8c4c5 100644
index bae0e95b3713..037c6e37edc9 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@ -38146,7 +38146,7 @@ index a4a4b1c64d32..86dc2efb1850 100644
/*
* Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c
index 6cd48a61cda3..bb623ca6397e 100644
index 9af548fb841b..2ff09b709f7b 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@ -38158,10 +38158,10 @@ index 6cd48a61cda3..bb623ca6397e 100644
long vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/proc/base.c b/fs/proc/base.c
index d86c0afc8a85..ae484a4d2070 100644
index aa69c35d904c..14b58991a20c 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2170,7 +2170,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -2178,7 +2178,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
rc = -ENOENT;
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
@ -38187,7 +38187,7 @@ index 13452b32e2bd..38acccfef9d4 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index dbda4499a859..5f6fdf574d83 100644
index 5066b0251ed8..5225ed8f8375 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@ -38228,7 +38228,7 @@ index a6d21fc0033c..02c2de31196e 100644
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/fs/read_write.c b/fs/read_write.c
index 4fb797822567..1f6bbcf3dd34 100644
index d3428189f36b..9344096050ad 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -488,6 +488,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@ -38270,7 +38270,7 @@ index 4fb797822567..1f6bbcf3dd34 100644
/* caller is responsible for file_start_write/file_end_write */
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
{
@@ -586,6 +611,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
@@ -594,6 +619,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
file_end_write(file);
return ret;
}
@ -38279,10 +38279,10 @@ index 4fb797822567..1f6bbcf3dd34 100644
/* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file)
diff --git a/fs/splice.c b/fs/splice.c
index d7c8a7c4db07..663e01ab2779 100644
index ce75aec52274..c8d8cf3b8cf7 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -839,8 +839,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@@ -859,8 +859,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
@ -38293,7 +38293,7 @@ index d7c8a7c4db07..663e01ab2779 100644
{
if (out->f_op->splice_write)
return out->f_op->splice_write(pipe, out, ppos, len, flags);
@@ -850,9 +850,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
@@ -870,9 +870,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.
*/
@ -38306,7 +38306,7 @@ index d7c8a7c4db07..663e01ab2779 100644
{
int ret;
@@ -870,6 +870,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
@@ -890,6 +890,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
return in->f_op->splice_read(in, ppos, pipe, len, flags);
return default_file_splice_read(in, ppos, pipe, len, flags);
}
@ -38314,7 +38314,7 @@ index d7c8a7c4db07..663e01ab2779 100644
/**
* splice_direct_to_actor - splices data directly between two non-pipes
@@ -1016,6 +1017,7 @@ static int direct_splice_actor(struct pipe_inode_info *pipe,
@@ -1036,6 +1037,7 @@ static int direct_splice_actor(struct pipe_inode_info *pipe,
return do_splice_from(pipe, file, sd->opos, sd->total_len,
sd->flags);
}
@ -38344,10 +38344,10 @@ index 1373a610dc78..fa5c7fba7f1b 100644
/*
* Write out and wait upon all dirty data associated with this
diff --git a/fs/xattr.c b/fs/xattr.c
index 95f38f57347f..f01b5bd9c102 100644
index 386b45676d7e..abd3ec03afaf 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -333,6 +333,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
@@ -360,6 +360,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
*xattr_value = value;
return error;
}
@ -38356,10 +38356,10 @@ index 95f38f57347f..f01b5bd9c102 100644
ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f5abba86107d..0b008da5678d 100644
index 7d4d04c9d3e6..663a13b071ca 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1360,6 +1360,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -1337,6 +1337,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);
@ -38367,7 +38367,7 @@ index f5abba86107d..0b008da5678d 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
@@ -1848,6 +1849,7 @@ struct file_operations {
@@ -1822,6 +1823,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
@ -38375,7 +38375,7 @@ index f5abba86107d..0b008da5678d 100644
int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1918,6 +1920,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
@@ -1892,6 +1894,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
@ -38388,7 +38388,7 @@ index f5abba86107d..0b008da5678d 100644
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
@@ -2352,6 +2360,7 @@ extern int current_umask(void);
@@ -2313,6 +2321,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode);
extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int);
@ -38396,19 +38396,19 @@ index f5abba86107d..0b008da5678d 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
@@ -2633,6 +2642,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
@@ -2549,6 +2558,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
}
#endif
void emergency_thaw_all(void);
+extern int __sync_filesystem(struct super_block *, int);
extern int sync_filesystem(struct super_block *);
extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 8fce5c98a4b0..c1a3f172e97a 100644
index 1130f271de66..d2ae377f2f19 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -395,6 +395,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@@ -237,6 +237,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}
@ -38417,7 +38417,7 @@ index 8fce5c98a4b0..c1a3f172e97a 100644
/*
* Acquire a lock.
*
@@ -540,6 +542,7 @@ struct lockdep_map { };
@@ -371,6 +373,7 @@ static inline void lockdep_unregister_key(struct lock_class_key *key)
#define lockdep_depth(tsk) (0)
@ -38426,10 +38426,10 @@ index 8fce5c98a4b0..c1a3f172e97a 100644
#define lockdep_assert_held(l) do { (void)(l); } while (0)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index dc7b87310c10..40e450bbf00f 100644
index 16b799a0522c..161dcccb25cf 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1684,6 +1684,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -1704,6 +1704,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
@ -38459,10 +38459,10 @@ index dc7b87310c10..40e450bbf00f 100644
void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 64ede5f150dc..1c899fd6bda4 100644
index ed028af3cb19..7b5590f94747 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -276,6 +276,7 @@ struct vm_region {
@@ -280,6 +280,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
@ -38470,7 +38470,7 @@ index 64ede5f150dc..1c899fd6bda4 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
@@ -355,6 +356,7 @@ struct vm_area_struct {
@@ -359,6 +360,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */
struct file * vm_file; /* File we map to (can be NULL). */
@ -38972,10 +38972,10 @@ index 000000000000..34738b8cf349
+
+#endif /* __AUFS_TYPE_H__ */
diff --git a/kernel/fork.c b/kernel/fork.c
index efc5493203ae..ba1174fb5d91 100644
index 8934886d1654..2e261f5e6676 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -570,7 +570,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -554,7 +554,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;
@ -38985,10 +38985,10 @@ index efc5493203ae..ba1174fb5d91 100644
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 29a8de4c50b9..1d54603f1f56 100644
index 85d15f0362dc..9bf241eb5624 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -169,7 +169,7 @@ static
@@ -186,7 +186,7 @@ static
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
@ -38997,7 +38997,7 @@ index 29a8de4c50b9..1d54603f1f56 100644
{
unsigned int class_idx = hlock->class_idx;
@@ -190,6 +190,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
@@ -207,6 +207,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
@ -39007,16 +39007,16 @@ index 29a8de4c50b9..1d54603f1f56 100644
#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 5c0848ca1287..87f09e627840 100644
index 613b2d634af8..1dd58908215d 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -138,3 +138,4 @@ void task_work_run(void)
@@ -144,3 +144,4 @@ void task_work_run(void)
} while (work);
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/mm/Makefile b/mm/Makefile
index 6e9d46b2efc9..a432b5664d83 100644
index d5649f1c12c0..d859cd529c09 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
@ -39029,10 +39029,10 @@ index 6e9d46b2efc9..a432b5664d83 100644
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
index 385759c4ce4b..570f4e1bc4d3 100644
index 407b94d8ce00..999513ca2438 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2676,7 +2676,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -2871,7 +2871,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
@ -39042,7 +39042,7 @@ index 385759c4ce4b..570f4e1bc4d3 100644
if (page->mapping != inode->i_mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
index 8c7ca737a19b..c4e2b1383925 100644
index 7a8987aa6996..4a8c2c1837a4 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@ -39063,7 +39063,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1831,8 +1831,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
@@ -1856,8 +1856,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
@ -39073,7 +39073,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
@@ -2694,7 +2694,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2719,7 +2719,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
@ -39082,7 +39082,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2713,7 +2713,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -2738,7 +2738,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
@ -39091,7 +39091,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
@@ -2906,7 +2906,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -2931,7 +2931,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
@ -39100,7 +39100,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
@@ -2981,10 +2981,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -3006,10 +3006,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
@ -39108,7 +39108,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
+ vma_get_file(vma);
+ file = vma->vm_file;
+ prfile = vma->vm_prfile;
ret = do_mmap_pgoff(vma->vm_file, start, size,
ret = do_mmap(vma->vm_file, start, size,
prot, flags, pgoff, &populate, NULL);
+ if (!IS_ERR_VALUE(ret) && file && prfile) {
+ struct vm_area_struct *new_vma;
@ -39129,7 +39129,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
out:
mmap_write_unlock(mm);
if (populate)
@@ -3275,7 +3292,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
@@ -3301,7 +3318,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
@ -39139,7 +39139,7 @@ index 8c7ca737a19b..c4e2b1383925 100644
new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c
index f32a69095d50..26cd21666185 100644
index 75a327149af1..479a091602c9 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -540,7 +540,7 @@ static void __put_nommu_region(struct vm_region *region)

90
kernel-x86_64.config
View file

@ -547,7 +547,7 @@ CONFIG_BATTERY_TWL4030_MADC=m
CONFIG_BAYCOM_PAR=m
CONFIG_BAYCOM_SER_FDX=m
CONFIG_BAYCOM_SER_HDX=m
# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
# CONFIG_BCACHE_DEBUG is not set
CONFIG_BCACHE=m
@ -649,6 +649,7 @@ CONFIG_BLOCK=y
CONFIG_BMA220=m
CONFIG_BMA400_I2C=m
CONFIG_BMA400=m
CONFIG_BMA400_SPI=m
CONFIG_BMC150_ACCEL_I2C=m
CONFIG_BMC150_ACCEL=m
CONFIG_BMC150_ACCEL_SPI=m
@ -693,6 +694,7 @@ CONFIG_BPF_EVENTS=y
CONFIG_BPFILTER_UMH=m
CONFIG_BPFILTER=y
CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_JIT_DEFAULT_ON=y
CONFIG_BPF_JIT=y
CONFIG_BPF_KPROBE_OVERRIDE=y
# CONFIG_BPF_LSM is not set
@ -896,6 +898,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_CDROM_PKTCDVD=m
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
CONFIG_CDROM=y
CONFIG_CEC_CH7322=m
CONFIG_CEC_CORE=m
CONFIG_CEC_CROS_EC=m
CONFIG_CEC_GPIO=m
@ -946,6 +949,7 @@ CONFIG_CHARGER_BQ2415X=m
CONFIG_CHARGER_BQ24190=m
CONFIG_CHARGER_BQ24257=m
CONFIG_CHARGER_BQ24735=m
CONFIG_CHARGER_BQ2515X=m
CONFIG_CHARGER_BQ25890=m
CONFIG_CHARGER_CROS_USBPD=m
CONFIG_CHARGER_DA9150=m
@ -1509,7 +1513,11 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_ENTRY is not set
# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
@ -1565,6 +1573,7 @@ CONFIG_DECOMPRESS_LZ4=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_ZSTD=y
CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_DEADLINE is not set
@ -1698,6 +1707,7 @@ CONFIG_DQL=y
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_DRM_AMD_ACP=y
CONFIG_DRM_AMD_DC_DCN3_0=y
CONFIG_DRM_AMD_DC_DCN=y
# CONFIG_DRM_AMD_DC_HDCP is not set
CONFIG_DRM_AMD_DC=y
@ -2366,6 +2376,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX_PMD=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION_ALGS=y
# CONFIG_FS_ENCRYPTION_INLINE_CRYPT is not set
CONFIG_FS_ENCRYPTION=y
CONFIG_FS_IOMAP=y
CONFIG_FS_MBCACHE=y
@ -2427,7 +2438,7 @@ CONFIG_GART_IOMMU=y
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
# CONFIG_GCC_PLUGINS is not set
CONFIG_GCC_PLUGINS=y
# CONFIG_GCOV_KERNEL is not set
# CONFIG_GDB_SCRIPTS is not set
CONFIG_GENERIC_ADC_BATTERY=m
@ -2529,6 +2540,7 @@ CONFIG_GPIO_MSIC=y
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_PCA9570=m
CONFIG_GPIO_PCF857X=m
CONFIG_GPIO_PCIE_IDIO_24=m
CONFIG_GPIO_PCI_IDIO_16=m
@ -2561,6 +2573,7 @@ CONFIG_GPIO_XILINX=m
CONFIG_GPIO_XRA1403=m
CONFIG_GRACE_PERIOD=m
CONFIG_GREENASIA_FF=y
CONFIG_GREYBUS_AUDIO_APB_CODEC=m
CONFIG_GREYBUS_AUDIO=m
CONFIG_GREYBUS_BOOTROM=m
CONFIG_GREYBUS_BRIDGED_PHY=m
@ -2809,6 +2822,7 @@ CONFIG_HWMON_VID=m
CONFIG_HWMON=y
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_BA431=m
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
@ -3171,6 +3185,7 @@ CONFIG_INT340X_THERMAL=m
CONFIG_INTEGRITY_AUDIT=y
# CONFIG_INTEGRITY_SIGNATURE is not set
CONFIG_INTEGRITY=y
CONFIG_INTEL_ATOMISP2_LED=m
CONFIG_INTEL_ATOMISP=y
CONFIG_INTEL_BXT_PMIC_THERMAL=m
CONFIG_INTEL_BXTWC_PMIC_TMU=m
@ -3246,6 +3261,9 @@ CONFIG_INTEL_XWAY_PHY=m
CONFIG_INTERCONNECT=y
# CONFIG_INTERVAL_TREE_TEST is not set
CONFIG_INTERVAL_TREE=y
CONFIG_INV_ICM42600_I2C=m
CONFIG_INV_ICM42600=m
CONFIG_INV_ICM42600_SPI=m
CONFIG_INV_MPU6050_I2C=m
CONFIG_INV_MPU6050_IIO=m
CONFIG_INV_MPU6050_SPI=m
@ -3464,6 +3482,7 @@ CONFIG_IR_SHARP_DECODER=m
CONFIG_IR_SIR=m
CONFIG_IR_SONY_DECODER=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_TOY=m
CONFIG_IR_TTUSBIR=m
CONFIG_IR_WINBOND_CIR=m
CONFIG_IR_XMP_DECODER=m
@ -3593,6 +3612,7 @@ CONFIG_KEMPLD_WDT=m
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_KERNEL_XZ=y
# CONFIG_KERNEL_ZSTD is not set
CONFIG_KERNFS=y
CONFIG_KEXEC_CORE=y
CONFIG_KEXEC_FILE=y
@ -3715,6 +3735,7 @@ CONFIG_LEDS_BD2802=m
CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
CONFIG_LEDS_CLASS_FLASH=m
CONFIG_LEDS_CLASS_MULTICOLOR=m
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_DA903X=m
@ -3731,11 +3752,6 @@ CONFIG_LEDS_LM36274=m
CONFIG_LEDS_LM3642=m
CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LP3952=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP8501=m
CONFIG_LEDS_LP8788=m
CONFIG_LEDS_MAX8997=m
CONFIG_LEDS_MC13783=m
@ -3941,6 +3957,7 @@ CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_BUS=y
CONFIG_MDIO_CAVIUM=m
CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_DEVRES=y
CONFIG_MDIO_GPIO=m
CONFIG_MDIO_I2C=m
CONFIG_MDIO=m
@ -4203,10 +4220,13 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA_TLS is not set
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
# CONFIG_MLX5_IPSEC is not set
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SW_STEERING=y
CONFIG_MLX5_TC_CT=y
# CONFIG_MLX5_TLS is not set
CONFIG_MLX5_VDPA_NET=m
CONFIG_MLX5_VDPA=y
CONFIG_MLX90614=m
CONFIG_MLX90632=m
CONFIG_MLXFW=m
@ -4285,7 +4305,7 @@ CONFIG_MOST_I2C=m
CONFIG_MOST=m
CONFIG_MOST_NET=m
CONFIG_MOST_SOUND=m
CONFIG_MOST_USB=m
CONFIG_MOST_USB_HDM=m
CONFIG_MOST_VIDEO=m
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
@ -4347,9 +4367,12 @@ CONFIG_MT7601U=m
CONFIG_MT7603E=m
CONFIG_MT7615_COMMON=m
CONFIG_MT7615E=m
CONFIG_MT7663S=m
CONFIG_MT7663U=m
CONFIG_MT7663_USB_SDIO_COMMON=m
CONFIG_MT76_CORE=m
CONFIG_MT76_LEDS=y
CONFIG_MT76_SDIO=m
CONFIG_MT76_USB=m
CONFIG_MT76x02_LIB=m
CONFIG_MT76x02_USB=m
@ -4580,6 +4603,7 @@ CONFIG_NET_DSA_TAG_LAN9303=m
CONFIG_NET_DSA_TAG_MTK=m
CONFIG_NET_DSA_TAG_OCELOT=m
CONFIG_NET_DSA_TAG_QCA=m
CONFIG_NET_DSA_TAG_RTL4_A=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
CONFIG_NET_DSA_VITESSE_VSC73XX=m
@ -4944,9 +4968,9 @@ CONFIG_NFSD=m
CONFIG_NFSD_PNFS=y
CONFIG_NFSD_SCSILAYOUT=y
CONFIG_NFSD_V2_ACL=y
# CONFIG_NFSD_V4_2_INTER_SSC is not set
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V3=y
# CONFIG_NFSD_V4_2_INTER_SSC is not set
CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFSD_V4=y
CONFIG_NFS_FSCACHE=y
@ -5086,6 +5110,7 @@ CONFIG_NOTIFIER_ERROR_INJECTION=m
CONFIG_NOUVEAU_DEBUG=5
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
# CONFIG_NOUVEAU_DEBUG_MMU is not set
# CONFIG_NOUVEAU_DEBUG_PUSH is not set
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOZOMI=m
CONFIG_NR_CPUS=8192
@ -5129,6 +5154,7 @@ CONFIG_NVME_RDMA=m
CONFIG_NVME_TARGET_FC=m
CONFIG_NVME_TARGET_LOOP=m
CONFIG_NVME_TARGET=m
# CONFIG_NVME_TARGET_PASSTHRU is not set
CONFIG_NVME_TARGET_RDMA=m
CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
@ -5406,6 +5432,7 @@ CONFIG_PINCTRL_CS47L90=y
CONFIG_PINCTRL_CS47L92=y
CONFIG_PINCTRL_DA9062=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_EMMITSBURG=m
CONFIG_PINCTRL_GEMINILAKE=m
CONFIG_PINCTRL_ICELAKE=m
CONFIG_PINCTRL_INTEL=m
@ -5426,6 +5453,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=y
# CONFIG_PKCS7_TEST_KEY is not set
CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
CONFIG_PLATFORM_SI4713=m
CONFIG_PLDMFW=y
CONFIG_PLIP=m
CONFIG_PLX_DMA=m
CONFIG_PLX_HERMES=m
@ -5681,6 +5709,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_EXPERT is not set
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_PERF_TEST=m
# CONFIG_RCU_REF_SCALE_TEST is not set
CONFIG_RCU_STALL_COMMON=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set
@ -5697,6 +5726,7 @@ CONFIG_RDS=m
CONFIG_RDS_RDMA=m
CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
CONFIG_RD_ZSTD=y
# CONFIG_READABLE_ASM is not set
# CONFIG_READ_ONLY_THP_FOR_FS is not set
CONFIG_REALTEK_AUTOPM=y
@ -5770,6 +5800,7 @@ CONFIG_REGULATOR_MT6323=m
CONFIG_REGULATOR_MT6358=m
CONFIG_REGULATOR_MT6397=m
CONFIG_REGULATOR_PALMAS=m
CONFIG_REGULATOR_PCA9450=m
CONFIG_REGULATOR_PCAP=m
CONFIG_REGULATOR_PCF50633=m
CONFIG_REGULATOR_PFUZE100=m
@ -5777,7 +5808,9 @@ CONFIG_REGULATOR_PV88060=m
CONFIG_REGULATOR_PV88080=m
CONFIG_REGULATOR_PV88090=m
CONFIG_REGULATOR_PWM=m
CONFIG_REGULATOR_QCOM_LABIBB=m
CONFIG_REGULATOR_QCOM_SPMI=m
CONFIG_REGULATOR_QCOM_USB_VBUS=m
CONFIG_REGULATOR_RC5T583=m
CONFIG_REGULATOR_RT5033=m
CONFIG_REGULATOR_S2MPA01=m
@ -5814,6 +5847,7 @@ CONFIG_REISERFS_FS_XATTR=y
# CONFIG_REISERFS_PROC_INFO is not set
CONFIG_RELAY=y
CONFIG_RELOCATABLE=y
# CONFIG_REMOTEPROC_CDEV is not set
CONFIG_REMOTEPROC=y
CONFIG_RENESAS_PHY=m
# CONFIG_RESET_ATTACK_MITIGATION is not set
@ -6049,6 +6083,8 @@ CONFIG_RT_MUTEXES=y
CONFIG_RTS5208=m
CONFIG_RTW88_8723DE=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821CE=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822CE=m
@ -6115,6 +6151,9 @@ CONFIG_SBP_TARGET=m
CONFIG_SC1200_WDT=m
CONFIG_SC92031=m
CONFIG_SCA3000=m
CONFIG_SCD30_CORE=m
CONFIG_SCD30_I2C=m
CONFIG_SCD30_SERIAL=m
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_DEBUG=y
CONFIG_SCHED_HRTICK=y
@ -6222,6 +6261,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
CONFIG_SCSI_UFS_BSG=y
CONFIG_SCSI_UFS_CDNS_PLATFORM=m
# CONFIG_SCSI_UFS_CRYPTO is not set
CONFIG_SCSI_UFS_DWC_TC_PCI=m
CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
CONFIG_SCSI_UFSHCD=m
@ -6309,6 +6349,7 @@ CONFIG_SENSORS_AXI_FAN_CONTROL=m
CONFIG_SENSORS_BEL_PFE=m
CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORSAIR_CPRO=m
CONFIG_SENSORS_DA9052_ADC=m
CONFIG_SENSORS_DA9055=m
CONFIG_SENSORS_DELL_SMM=m
@ -6694,7 +6735,7 @@ CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA=m
CONFIG_SND_HDA_PATCH_LOADER=y
@ -6917,7 +6958,9 @@ CONFIG_SND_SOC_MAX9759=m
CONFIG_SND_SOC_MAX98088=m
CONFIG_SND_SOC_MAX98090=m
CONFIG_SND_SOC_MAX98357A=m
CONFIG_SND_SOC_MAX98373_I2C=m
CONFIG_SND_SOC_MAX98373=m
CONFIG_SND_SOC_MAX98373_SDW=m
CONFIG_SND_SOC_MAX98390=m
CONFIG_SND_SOC_MAX98504=m
CONFIG_SND_SOC_MAX9860=m
@ -6955,6 +6998,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m
CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT1015=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT286=m
CONFIG_SND_SOC_RT298=m
@ -7153,18 +7197,6 @@ CONFIG_SPARSEMEM_MANUAL=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSEMEM=y
CONFIG_SPEAKUP=m
CONFIG_SPEAKUP_SYNTH_ACNTSA=m
CONFIG_SPEAKUP_SYNTH_APOLLO=m
CONFIG_SPEAKUP_SYNTH_AUDPTR=m
CONFIG_SPEAKUP_SYNTH_BNS=m
CONFIG_SPEAKUP_SYNTH_DECEXT=m
CONFIG_SPEAKUP_SYNTH_DECTLK=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_SPEAKUP_SYNTH_LTLK=m
CONFIG_SPEAKUP_SYNTH_SOFT=m
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_ALTERA=m
CONFIG_SPI_AMD=m
CONFIG_SPI_AXI_SPI_ENGINE=m
@ -7180,6 +7212,7 @@ CONFIG_SPI_DW_PCI=m
CONFIG_SPI_GPIO=m
# CONFIG_SPI_INTEL_SPI_PCI is not set
# CONFIG_SPI_INTEL_SPI_PLATFORM is not set
CONFIG_SPI_LANTIQ_SSC=m
CONFIG_SPI_LM70_LLP=m
CONFIG_SPI_LOOPBACK_TEST=m
CONFIG_SPI_MASTER=y
@ -7405,6 +7438,8 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_BLACKHOLE_DEV is not set
CONFIG_TEST_BPF=m
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_FPU is not set
# CONFIG_TEST_FREE_PAGES is not set
# CONFIG_TEST_HASH is not set
# CONFIG_TEST_HEXDUMP is not set
# CONFIG_TEST_HMM is not set
@ -7449,6 +7484,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
CONFIG_THERMAL_GOV_STEP_WISE=y
CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_NETLINK is not set
CONFIG_THERMAL_STATISTICS=y
CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_THERMAL=y
@ -7511,6 +7547,7 @@ CONFIG_TLS=m
CONFIG_TMD_HERMES=m
CONFIG_TMP006=m
CONFIG_TMP007=m
# CONFIG_TMPFS_INODE64 is not set
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
@ -8020,9 +8057,9 @@ CONFIG_USB_OHCI_HCD_PCI=y
CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_PRODUCTLIST is not set
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
@ -8279,6 +8316,7 @@ CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_DT3155=m
CONFIG_VIDEO_DW9714=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
@ -8357,6 +8395,7 @@ CONFIG_VIDEO_OV9650=m
CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
CONFIG_VIDEO_RDACM20=m
CONFIG_VIDEO_RJ54N1=m
CONFIG_VIDEO_S5C73M3=m
CONFIG_VIDEO_S5K4ECGX=m
@ -8588,6 +8627,7 @@ CONFIG_WLAN_VENDOR_INTEL=y
CONFIG_WLAN_VENDOR_INTERSIL=y
CONFIG_WLAN_VENDOR_MARVELL=y
CONFIG_WLAN_VENDOR_MEDIATEK=y
CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WLAN_VENDOR_QUANTENNA=y
CONFIG_WLAN_VENDOR_RALINK=y
CONFIG_WLAN_VENDOR_REALTEK=y
@ -8730,6 +8770,7 @@ CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_XEN_SYMS=y
CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XEN_WDT=m
CONFIG_XEN_XENBUS_FRONTEND=y
CONFIG_XEN=y
@ -8761,6 +8802,7 @@ CONFIG_XILINX_SDFEC=m
CONFIG_XILINX_VCU=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_XILINX_XADC=m
CONFIG_XILINX_ZYNQMP_DPDMA=m
CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
CONFIG_XOR_BLOCKS=y

5
kernel.spec
View file

@ -1,7 +1,7 @@
%define kernelversion 5
%define patchlevel 8
%define patchlevel 9
# sublevel is used for stable-based kernels
%define sublevel 16
%define sublevel 3
# Release number. Increase this before a rebuild.
%define rpmrel 1
@ -188,7 +188,6 @@ Patch109: fs-aufs.patch
# Other patches
Patch110: objtool-sync-check.sh-set-the-exit-code-explicitly.patch
Patch111: perf-zstd-use-zu-to-print-size_t-values.patch
####################################################################
Autoreqprov: no

61
perf-zstd-use-zu-to-print-size_t-values.patch
View file

@ -1,61 +0,0 @@
From 2a99dddb5fa823af36cb38a417a0a137dedde870 Mon Sep 17 00:00:00 2001
From: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
Date: Tue, 24 Mar 2020 15:38:40 +0300
Subject: [PATCH] perf,zstd: use %zu to print size_t values
Otherwise the build of a 32-bit kernel complains as follows:
In file included from util/session.c:17:0:
util/session.c: In function 'perf_session__process_compressed_event':
util/session.c:91:11: error: format '%ld' expects argument of type
'long int', but argument 4 has type 'size_t {aka unsigned int}' [-Werror=format=]
pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size);
...and fails.
Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
---
tools/perf/util/session.c | 2 +-
tools/perf/util/zstd.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index d0d7d25b23e3..55c3d2fefd41 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -88,7 +88,7 @@ static int perf_session__process_compressed_event(struct perf_session *session,
session->decomp_last = decomp;
}
- pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size);
+ pr_debug("decomp (B): %zu to %zu\n", src_size, decomp_size);
return 0;
}
diff --git a/tools/perf/util/zstd.c b/tools/perf/util/zstd.c
index d2202392ffdb..b5d29399cc9b 100644
--- a/tools/perf/util/zstd.c
+++ b/tools/perf/util/zstd.c
@@ -74,8 +74,8 @@ size_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t
ret = ZSTD_compressStream(data->cstream, &output, &input);
ZSTD_flushStream(data->cstream, &output);
if (ZSTD_isError(ret)) {
- pr_err("failed to compress %ld bytes: %s\n",
- (long)src_size, ZSTD_getErrorName(ret));
+ pr_err("failed to compress %zu bytes: %s\n",
+ src_size, ZSTD_getErrorName(ret));
memcpy(dst, src, src_size);
return src_size;
}
@@ -99,7 +99,7 @@ size_t zstd_decompress_stream(struct zstd_data *data, void *src, size_t src_size
while (input.pos < input.size) {
ret = ZSTD_decompressStream(data->dstream, &output, &input);
if (ZSTD_isError(ret)) {
- pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n",
+ pr_err("failed to decompress (B): %zu -> %zu, dst_size %zu : %s\n",
src_size, output.size, dst_size, ZSTD_getErrorName(ret));
break;
}
--
2.24.0