mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 18:42:55 +00:00
Update to 5.15.43, add nvidia515, up P109
This commit is contained in:
survolog (Andrey Grigorev)
parent
ba73f15b85
commit
3c645c2c80
3 changed files with 10 additions and 34 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,6 +1,6 @@
|
|||
sources:
|
||||
linux-5.15.tar.xz: ac61f2459040c09af1d5abd4ed100c3d316b443e
|
||||
patch-5.15.32.xz: a80932863f4cbb2572bf754be48351981956ba5b
|
||||
patch-5.15.43.xz: 798d06ee77587a2d13c09b6631292a179b45040a
|
||||
public_key_GOST_1.pem: b4fb6bf1cf73824944931a8f0c2cb7bf427e0774
|
||||
public_key_GOST_2.pem: cba209bd331f29031c5d945949b230a8d7a4dc12
|
||||
public_key_GOST_3.pem: e5a223dd7c556d4d0cac326f5ed9fc12dd769afb
|
||||
|
|
|
|||
|
|
@ -32206,7 +32206,7 @@ diff -ruN a/fs/aufs/vfsub.c b/fs/aufs/vfsub.c
|
|||
+
|
||||
+ lockdep_off();
|
||||
+ down_read(&h_sb->s_umount);
|
||||
+ err = __sync_filesystem(h_sb, wait);
|
||||
+
|
||||
+ up_read(&h_sb->s_umount);
|
||||
+ lockdep_on();
|
||||
+
|
||||
|
|
@ -38293,14 +38293,6 @@ diff -ruN a/fs/file_table.c b/fs/file_table.c
|
|||
|
||||
/*
|
||||
* Variant of alloc_empty_file() that doesn't check and modify nr_files.
|
||||
@@ -375,6 +376,7 @@
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(fput);
|
||||
+EXPORT_SYMBOL_GPL(__fput_sync);
|
||||
|
||||
void __init files_init(void)
|
||||
{
|
||||
diff -ruN a/fs/inode.c b/fs/inode.c
|
||||
--- a/fs/inode.c 2021-10-31 23:53:10.000000000 +0300
|
||||
+++ b/fs/inode.c 2022-03-30 02:33:39.114719874 +0300
|
||||
|
|
@ -38519,26 +38511,6 @@ diff -ruN a/fs/splice.c b/fs/splice.c
|
|||
|
||||
/**
|
||||
* splice_direct_to_actor - splices data directly between two non-pipes
|
||||
diff -ruN a/fs/sync.c b/fs/sync.c
|
||||
--- a/fs/sync.c 2021-10-31 23:53:10.000000000 +0300
|
||||
+++ b/fs/sync.c 2022-03-30 02:32:38.416760234 +0300
|
||||
@@ -28,7 +28,7 @@
|
||||
* wait == 1 case since in that case write_inode() functions do
|
||||
* sync_dirty_buffer() and thus effectively write one block at a time.
|
||||
*/
|
||||
-static int __sync_filesystem(struct super_block *sb, int wait)
|
||||
+int __sync_filesystem(struct super_block *sb, int wait)
|
||||
{
|
||||
if (wait)
|
||||
sync_inodes_sb(sb);
|
||||
@@ -39,6 +39,7 @@
|
||||
sb->s_op->sync_fs(sb, wait);
|
||||
return __sync_blockdev(sb->s_bdev, wait);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(__sync_filesystem);
|
||||
|
||||
/*
|
||||
* Write out and wait upon all dirty data associated with this
|
||||
diff -ruN a/fs/xattr.c b/fs/xattr.c
|
||||
--- a/fs/xattr.c 2021-10-31 23:53:10.000000000 +0300
|
||||
+++ b/fs/xattr.c 2022-03-30 02:32:38.416760234 +0300
|
||||
|
|
@ -39189,7 +39161,7 @@ diff -ruN a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
|
|||
+++ b/kernel/locking/lockdep.c 2022-03-30 02:32:38.417760234 +0300
|
||||
@@ -189,7 +189,7 @@
|
||||
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
|
||||
static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
|
||||
DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
|
||||
|
||||
-static inline struct lock_class *hlock_class(struct held_lock *hlock)
|
||||
+inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
|
||||
|
|
|
|||
10
kernel.spec
10
kernel.spec
|
|
@ -29,10 +29,10 @@
|
|||
|
||||
%define kernelversion 5
|
||||
%define patchlevel 15
|
||||
%define sublevel 32
|
||||
%define sublevel 43
|
||||
|
||||
# Release number. Increase this before a rebuild.
|
||||
%define rpmrel 7
|
||||
%define rpmrel 1
|
||||
%define fullrpmrel %{rpmrel}
|
||||
|
||||
%define rpmtag %{disttag}
|
||||
|
|
@ -450,6 +450,7 @@ BuildRequires: kernel-source-nvidia390
|
|||
%ifarch %{x86_64}
|
||||
BuildRequires: kernel-source-nvidia470
|
||||
BuildRequires: kernel-source-nvidia510
|
||||
BuildRequires: kernel-source-nvidia515
|
||||
%endif
|
||||
BuildRequires: kernel-source-tripso
|
||||
BuildRequires: kernel-source-ipt-so
|
||||
|
|
@ -512,6 +513,7 @@ Requires: ((kernel-modules-nvidia390-%{version}-%{release}-%{flavour} = %{EVRD})
|
|||
#kroko_req_modules_in_kernel -j %%{nvidia_470_j} -n %%{nvidia_470_n} -p %%{kver_full}
|
||||
Requires: ((kernel-modules-nvidia470-%{version}-%{release}-%{flavour} = %{EVRD}) if nvidia470-core)
|
||||
Requires: ((kernel-modules-nvidia510-%{version}-%{release}-%{flavour} = %{EVRD}) if nvidia510-core)
|
||||
Requires: ((kernel-modules-nvidia515-%{version}-%{release}-%{flavour} = %{EVRD}) if nvidia515-core)
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
|
@ -570,6 +572,7 @@ depmod -a %{kver_full}
|
|||
%ifarch %{x86_64}
|
||||
%exclude %{_modulesdir}/%{kver_full}/kernel/drivers/video/nvidia470
|
||||
%exclude %{_modulesdir}/%{kver_full}/kernel/drivers/video/nvidia510
|
||||
%exclude %{_modulesdir}/%{kver_full}/kernel/drivers/video/nvidia515
|
||||
%endif
|
||||
%if %{with binary_shredder}
|
||||
%exclude %{_modulesdir}/%{kver_full}/kernel/extra/shredder-kernel.ko%{kmod_suffix}
|
||||
|
|
@ -922,7 +925,7 @@ User Mode Linux (UML) kernel modules:
|
|||
%endif
|
||||
%ifarch %{x86_64}
|
||||
#kroko_kmod_pkg -j %%{nvidia_470_j} -n %%{nvidia_470_n} -f %%{flavour} -k %%{kernelversion}.%%{patchlevel} -m %%{sublevel} -p %%{kver_full} -s %%{NAME} -r %%{kroko_mk_release}
|
||||
%nvidia_modules_pkg -e %{EVRD} -m 390,470,510 -p %{kver_full}
|
||||
%nvidia_modules_pkg -e %{EVRD} -m 390,470,510,515 -p %{kver_full}
|
||||
%endif
|
||||
%ksob_mk_module_pkg -n xt_TRIPSO -s net -r tripso
|
||||
%ksob_mk_module_pkg -n xt_so -s net -r ipt-so
|
||||
|
|
@ -1399,6 +1402,7 @@ _build_nvidia 390
|
|||
%ifarch %{x86_64}
|
||||
_build_nvidia 470
|
||||
_build_nvidia 510
|
||||
_build_nvidia 515
|
||||
%endif
|
||||
|
||||
cp -r "$(rpm -q --qf '/usr/src/tripso-%%{VERSION}-%%{RELEASE}' kernel-source-tripso)" kernel-source-tripso
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue