Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
23694cfac1 |
12
PKGBUILD
12
PKGBUILD
@@ -56,7 +56,7 @@ else
|
|||||||
fi
|
fi
|
||||||
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
||||||
pkgver="${_basekernel}"."${_sub}"
|
pkgver="${_basekernel}"."${_sub}"
|
||||||
pkgrel=270
|
pkgrel=269
|
||||||
pkgdesc='Linux-tkg'
|
pkgdesc='Linux-tkg'
|
||||||
arch=('x86_64') # no i686 in here
|
arch=('x86_64') # no i686 in here
|
||||||
url="https://www.kernel.org/"
|
url="https://www.kernel.org/"
|
||||||
@@ -68,7 +68,7 @@ fi
|
|||||||
optdepends=('schedtool')
|
optdepends=('schedtool')
|
||||||
options=('!strip' 'docs')
|
options=('!strip' 'docs')
|
||||||
|
|
||||||
for f in "$_where"/linux-tkg-config/"$_basekernel"/* "$_where"/linux-tkg-patches/"$_basekernel"/*; do
|
for f in $_where/linux-tkg-config/$_basekernel/* $_where/linux-tkg-patches/$_basekernel/*; do
|
||||||
source+=( "$f" )
|
source+=( "$f" )
|
||||||
sha256sums+=( "SKIP" )
|
sha256sums+=( "SKIP" )
|
||||||
done
|
done
|
||||||
@@ -95,9 +95,9 @@ build() {
|
|||||||
|
|
||||||
# Use custom compiler paths if defined
|
# Use custom compiler paths if defined
|
||||||
if [ "$_compiler_name" = "-llvm" ] && [ -n "${CUSTOM_LLVM_PATH}" ]; then
|
if [ "$_compiler_name" = "-llvm" ] && [ -n "${CUSTOM_LLVM_PATH}" ]; then
|
||||||
PATH="${CUSTOM_LLVM_PATH}/bin:${CUSTOM_LLVM_PATH}/lib:${CUSTOM_LLVM_PATH}/include:${PATH}"
|
PATH=${CUSTOM_LLVM_PATH}/bin:${CUSTOM_LLVM_PATH}/lib:${CUSTOM_LLVM_PATH}/include:${PATH}
|
||||||
elif [ -n "${CUSTOM_GCC_PATH}" ]; then
|
elif [ -n "${CUSTOM_GCC_PATH}" ]; then
|
||||||
PATH="${CUSTOM_GCC_PATH}/bin:${CUSTOM_GCC_PATH}/lib:${CUSTOM_GCC_PATH}/include:${PATH}"
|
PATH=${CUSTOM_GCC_PATH}/bin:${CUSTOM_GCC_PATH}/lib:${CUSTOM_GCC_PATH}/include:${PATH}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$_force_all_threads" = "true" ]; then
|
if [ "$_force_all_threads" = "true" ]; then
|
||||||
@@ -126,7 +126,7 @@ build() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
hackbase() {
|
hackbase() {
|
||||||
pkgdesc="The $pkgdesc kernel and modules - https://github.com/Frogging-Family/linux-tkg"
|
pkgdesc="The $pkgdesc kernel and modules"
|
||||||
depends=('coreutils' 'kmod' 'initramfs')
|
depends=('coreutils' 'kmod' 'initramfs')
|
||||||
optdepends=('linux-docs: Kernel hackers manual - HTML documentation that comes with the Linux kernel.'
|
optdepends=('linux-docs: Kernel hackers manual - HTML documentation that comes with the Linux kernel.'
|
||||||
'crda: to set the correct wireless channels of your country.'
|
'crda: to set the correct wireless channels of your country.'
|
||||||
@@ -191,7 +191,7 @@ hackbase() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
hackheaders() {
|
hackheaders() {
|
||||||
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel - https://github.com/Frogging-Family/linux-tkg"
|
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
|
||||||
provides=("linux-headers=${pkgver}" "${pkgbase}-headers=${pkgver}")
|
provides=("linux-headers=${pkgver}" "${pkgbase}-headers=${pkgver}")
|
||||||
case $_basever in
|
case $_basever in
|
||||||
54|57|58|59|510)
|
54|57|58|59|510)
|
||||||
|
@@ -103,6 +103,7 @@ The script will use a slightly modified Arch config from the `linux-tkg-config`
|
|||||||
- Some issues have been reported by both Fedora (see https://github.com/Frogging-Family/linux-tkg/issues/383) and Ubuntu (see https://github.com/Frogging-Family/linux-tkg/issues/436) users where stock kernels cannot boot any longer, the whereabouts are still not entirely clear (it does not seem to affect every user)
|
- Some issues have been reported by both Fedora (see https://github.com/Frogging-Family/linux-tkg/issues/383) and Ubuntu (see https://github.com/Frogging-Family/linux-tkg/issues/436) users where stock kernels cannot boot any longer, the whereabouts are still not entirely clear (it does not seem to affect every user)
|
||||||
- Ubuntu: appears to be an initramfs generation issue
|
- Ubuntu: appears to be an initramfs generation issue
|
||||||
- Fedora: needs disabling then re-enabling SELINUX so one can boot
|
- Fedora: needs disabling then re-enabling SELINUX so one can boot
|
||||||
|
- Fedora + Nvidia users: Fedora's `akmod` nvidia packages do not work with `linux-tkg` (see https://github.com/Frogging-Family/linux-tkg/issues/375). `linux-tkg` requires Nvidias official `.run` installer (that uses `dkms` instead of `akmod`) to properly work with Nvidia.
|
||||||
|
|
||||||
The interactive `install.sh` script will create, depending on the selected distro, `.deb` or `.rpm` packages, move them in the the subfolder `DEBS` or `RPMS` then prompts to install them with the distro's package manager.
|
The interactive `install.sh` script will create, depending on the selected distro, `.deb` or `.rpm` packages, move them in the the subfolder `DEBS` or `RPMS` then prompts to install them with the distro's package manager.
|
||||||
```shell
|
```shell
|
||||||
|
@@ -222,7 +222,7 @@ _random_trust_cpu="false"
|
|||||||
# Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "smt"
|
# Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "smt"
|
||||||
_runqueue_sharing=""
|
_runqueue_sharing=""
|
||||||
|
|
||||||
# Timer frequency - "100" "250" "300" "500" "750" "1000" ("2000" is available for cacule cpusched only) - More options available in kernel config prompt when left empty depending on selected cpusched with the default option pointed with a ">" (2000 for cacule, 100 for muqss and 1000 for other cpu schedulers)
|
# Timer frequency - "100" "500", "750" or "1000" ("2000" can be set for cacule cpu sched, and will fallback to default if set while on another schedulers) - More options available in kernel config prompt when left empty depending on selected cpusched with the default option pointed with a ">"
|
||||||
_timer_freq="500"
|
_timer_freq="500"
|
||||||
|
|
||||||
# Default CPU governor - "performance", "ondemand", "schedutil" or leave empty for default (schedutil)
|
# Default CPU governor - "performance", "ondemand", "schedutil" or leave empty for default (schedutil)
|
||||||
|
@@ -280,18 +280,18 @@ if [ "$1" = "install" ]; then
|
|||||||
else
|
else
|
||||||
_kernelname=$_basekernel.${_kernel_subver}_$_kernel_flavor
|
_kernelname=$_basekernel.${_kernel_subver}_$_kernel_flavor
|
||||||
fi
|
fi
|
||||||
|
_headers_rpm="kernel-headers-${_kernelname}*.rpm"
|
||||||
_kernel_rpm="kernel-${_kernelname}*.rpm"
|
_kernel_rpm="kernel-${_kernelname}*.rpm"
|
||||||
# The headers are actually contained in the kernel-devel RPM and not the headers one...
|
# The headers are actually contained in the kernel-devel RPM and not the headers one...
|
||||||
_kernel_devel_rpm="kernel-devel-${_kernelname}*.rpm"
|
_kernel_devel_rpm="kernel-devel-${_kernelname}*.rpm"
|
||||||
|
|
||||||
cd RPMS
|
cd RPMS
|
||||||
if [ "$_distro" = "Fedora" ]; then
|
if [ "$_distro" = "Fedora" ]; then
|
||||||
sudo dnf install $_kernel_rpm $_kernel_devel_rpm
|
sudo dnf install $_headers_rpm $_kernel_rpm $_kernel_devel_rpm
|
||||||
elif [ "$_distro" = "Suse" ]; then
|
elif [ "$_distro" = "Suse" ]; then
|
||||||
msg2 "Some files from 'linux-glibc-devel' will be replaced by files from the custom kernel-hearders package"
|
msg2 "Some files from 'linux-glibc-devel' will be replaced by files from the custom kernel-hearders package"
|
||||||
msg2 "To revert back to the original kernel headers do 'sudo zypper install -f linux-glibc-devel'"
|
msg2 "To revert back to the original kernel headers do 'sudo zypper install -f linux-glibc-devel'"
|
||||||
sudo zypper install --allow-unsigned-rpm $_kernel_rpm $_kernel_devel_rpm
|
sudo zypper install --replacefiles --allow-unsigned-rpm $_headers_rpm $_kernel_rpm $_kernel_devel_rpm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
msg2 "Install successful"
|
msg2 "Install successful"
|
||||||
|
@@ -176,11 +176,7 @@ _set_kver_internal_vars() {
|
|||||||
_basever="${_kver_split[0]}${_kver_split[1]}"
|
_basever="${_kver_split[0]}${_kver_split[1]}"
|
||||||
|
|
||||||
# examples: "5", "rc2", "122"
|
# examples: "5", "rc2", "122"
|
||||||
if [ -n "${_kver_split[2]}" ]; then
|
_sub="${_kver_split[2]}"
|
||||||
_sub="${_kver_split[2]}"
|
|
||||||
else
|
|
||||||
_sub="0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Append a zero to the minor if it has single digit
|
# Append a zero to the minor if it has single digit
|
||||||
[[ ${#_kver_split[1]} == "1" ]] && _kver_split[1]="0${_kver_split[1]}"
|
[[ ${#_kver_split[1]} == "1" ]] && _kver_split[1]="0${_kver_split[1]}"
|
||||||
@@ -297,7 +293,7 @@ _set_cpu_scheduler() {
|
|||||||
elif [ "$_kver" = "519" ]; then
|
elif [ "$_kver" = "519" ]; then
|
||||||
_avail_cpu_scheds=("cfs" "pds" "bmq" "cacule" "tt" "bore")
|
_avail_cpu_scheds=("cfs" "pds" "bmq" "cacule" "tt" "bore")
|
||||||
elif [ "$_kver" = "600" ]; then
|
elif [ "$_kver" = "600" ]; then
|
||||||
_avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
|
_avail_cpu_scheds=("cfs" "bore")
|
||||||
else
|
else
|
||||||
_avail_cpu_scheds=("cfs")
|
_avail_cpu_scheds=("cfs")
|
||||||
fi
|
fi
|
||||||
@@ -677,11 +673,6 @@ _tkg_srcprep() {
|
|||||||
tkgpatch="$srcdir/0003-glitched-base.patch"
|
tkgpatch="$srcdir/0003-glitched-base.patch"
|
||||||
_msg="Applying glitched base patch" && _tkg_patcher
|
_msg="Applying glitched base patch" && _tkg_patcher
|
||||||
|
|
||||||
if [[ "$_distro" =~ ^(Fedora|Suse)$ ]]; then
|
|
||||||
tkgpatch="$srcdir/0013-fedora-rpm.patch"
|
|
||||||
_msg="RPM: fixing spec generator" && _tkg_patcher
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z $_misc_adds ]; then
|
if [ -z $_misc_adds ]; then
|
||||||
plain "Enable misc additions ? They may contain temporary fixes pending upstream, or some other changes that can break on non-Arch distros."
|
plain "Enable misc additions ? They may contain temporary fixes pending upstream, or some other changes that can break on non-Arch distros."
|
||||||
read -rp "`echo $' > [Y]/n : '`" _interactive_misc_adds;
|
read -rp "`echo $' > [Y]/n : '`" _interactive_misc_adds;
|
||||||
@@ -804,10 +795,22 @@ _tkg_srcprep() {
|
|||||||
elif [ "${_cpusched}" = "tt" ]; then
|
elif [ "${_cpusched}" = "tt" ]; then
|
||||||
_msg="Applying TT patch"
|
_msg="Applying TT patch"
|
||||||
if [ "${_distro}" = "Void" ]; then
|
if [ "${_distro}" = "Void" ]; then
|
||||||
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$wrksrc"/tt.patch
|
if [[ $_kver = 515 ]]; then
|
||||||
|
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/TT/0001-tt-${_basekernel}.patch" > "$srcdir"/tt.patch
|
||||||
|
elif [[ $_kver = 517 ]] || [[ $_kver = 519 ]]; then
|
||||||
|
curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$wrksrc"/tt.patch
|
||||||
|
else
|
||||||
|
curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt-${_basekernel}.patch" > "$wrksrc"/tt.patch
|
||||||
|
fi
|
||||||
tkgpatch="$wrksrc/tt.patch" && _tkg_patcher
|
tkgpatch="$wrksrc/tt.patch" && _tkg_patcher
|
||||||
else
|
else
|
||||||
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$srcdir"/tt.patch
|
if [[ $_kver = 515 ]]; then
|
||||||
|
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/TT/0001-tt-${_basekernel}.patch" > "$srcdir"/tt.patch
|
||||||
|
elif [[ $_kver = 517 ]] || [[ $_kver = 519 ]]; then
|
||||||
|
curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$srcdir"/tt.patch
|
||||||
|
else
|
||||||
|
curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt-${_basekernel}.patch" > "$srcdir"/tt.patch
|
||||||
|
fi
|
||||||
tkgpatch="$srcdir/tt.patch" && _tkg_patcher
|
tkgpatch="$srcdir/tt.patch" && _tkg_patcher
|
||||||
fi
|
fi
|
||||||
if [ "$_tt_high_hz" = "true" ] && [ $_kver = 515 ]; then
|
if [ "$_tt_high_hz" = "true" ] && [ $_kver = 515 ]; then
|
||||||
@@ -822,11 +825,14 @@ _tkg_srcprep() {
|
|||||||
fi
|
fi
|
||||||
elif [ "${_cpusched}" = "bore" ]; then
|
elif [ "${_cpusched}" = "bore" ]; then
|
||||||
_msg="Applying BORE patch"
|
_msg="Applying BORE patch"
|
||||||
|
if [ "$_kver" = "518" ]; then
|
||||||
|
_bore_suffix="-sched"
|
||||||
|
fi
|
||||||
if [ "${_distro}" = "Void" ]; then
|
if [ "${_distro}" = "Void" ]; then
|
||||||
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$wrksrc"/0001-bore.patch
|
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore$_bore_suffix.patch" > "$wrksrc"/0001-bore.patch
|
||||||
tkgpatch="$wrksrc/0001-bore.patch" && _tkg_patcher
|
tkgpatch="$wrksrc/0001-bore.patch" && _tkg_patcher
|
||||||
else
|
else
|
||||||
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$srcdir"/0001-bore.patch
|
curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore$_bore_suffix.patch" > "$srcdir"/0001-bore.patch
|
||||||
tkgpatch="$srcdir/0001-bore.patch" && _tkg_patcher
|
tkgpatch="$srcdir/0001-bore.patch" && _tkg_patcher
|
||||||
fi
|
fi
|
||||||
elif [ "${_cpusched}" = "cfs" ]; then
|
elif [ "${_cpusched}" = "cfs" ]; then
|
||||||
@@ -1251,14 +1257,14 @@ _tkg_srcprep() {
|
|||||||
|
|
||||||
typeset -A _default_timer_frequencies_index
|
typeset -A _default_timer_frequencies_index
|
||||||
_default_timer_frequencies_index=(
|
_default_timer_frequencies_index=(
|
||||||
["pds"]="5"
|
["pds"]="3"
|
||||||
["muqss"]="1"
|
["muqss"]="1"
|
||||||
["cacule"]="6"
|
["cacule"]="5"
|
||||||
["tt"]="5"
|
["tt"]="5"
|
||||||
["upds"]="5"
|
["upds"]="3"
|
||||||
["cfs"]="5"
|
["cfs"]="3"
|
||||||
["bmq"]="5"
|
["bmq"]="3"
|
||||||
["bore"]="5"
|
["bore"]="3"
|
||||||
)
|
)
|
||||||
|
|
||||||
if [[ -n "$_timer_freq" && ! "${_avail_timer_frequencies[*]}" =~ "$_timer_freq" ]]; then
|
if [[ -n "$_timer_freq" && ! "${_avail_timer_frequencies[*]}" =~ "$_timer_freq" ]]; then
|
||||||
@@ -1266,7 +1272,7 @@ _tkg_srcprep() {
|
|||||||
_timer_freq=""
|
_timer_freq=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Default to 1000Hz if _timer_freq is not set
|
# Default to 500Hz if _timer_freq is not set
|
||||||
if [ -z "$_timer_freq" ]; then
|
if [ -z "$_timer_freq" ]; then
|
||||||
_default_index="${_default_timer_frequencies_index[$_cpusched]}"
|
_default_index="${_default_timer_frequencies_index[$_cpusched]}"
|
||||||
msg2 "Which kernel interrupt timer frequency would you like to use ?"
|
msg2 "Which kernel interrupt timer frequency would you like to use ?"
|
||||||
@@ -1558,8 +1564,8 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
|
|||||||
_msg="Patching winesync/fastsync support"
|
_msg="Patching winesync/fastsync support"
|
||||||
_tkg_patcher
|
_tkg_patcher
|
||||||
_module "WINESYNC"
|
_module "WINESYNC"
|
||||||
echo "KERNEL==\"winesync\", MODE=\"0644\"" > "${srcdir}"/winesync.rules
|
echo "KERNEL==\"winesync\", MODE=\"0644\"" > ../winesync.rules
|
||||||
echo "winesync" > "${srcdir}"/winesync.conf
|
echo "winesync" > ../winesync.conf
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1756,13 +1762,8 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
|
|||||||
if [ -z "$_diffconfig_name" ]; then
|
if [ -z "$_diffconfig_name" ]; then
|
||||||
echo 'No file name given, not generating config fragment.'
|
echo 'No file name given, not generating config fragment.'
|
||||||
else (
|
else (
|
||||||
if [ "$_distro" = "Arch" ] || [ "$_ispkgbuild" = "true" ]; then
|
prev_pwd="${PWD:-$(pwd)}"
|
||||||
prev_pwd="${PWD:-$(pwd)}/linux-src-git"
|
cd "$_where"
|
||||||
cd "$_where" || exit
|
|
||||||
else
|
|
||||||
prev_pwd="${PWD:-$(pwd)}"
|
|
||||||
cd "$_where" || exit
|
|
||||||
fi
|
|
||||||
"${prev_pwd}/scripts/diffconfig" -m "${prev_pwd}/.config.orig" "${prev_pwd}/.config" > "$_diffconfig_name"
|
"${prev_pwd}/scripts/diffconfig" -m "${prev_pwd}/.config.orig" "${prev_pwd}/.config" > "$_diffconfig_name"
|
||||||
) fi
|
) fi
|
||||||
fi
|
fi
|
||||||
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -9893,34 +9893,3 @@ index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646
|
|||||||
+
|
+
|
||||||
extern void swake_up_all_locked(struct swait_queue_head *q);
|
extern void swake_up_all_locked(struct swait_queue_head *q);
|
||||||
extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
|
extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
|
||||||
|
|
||||||
From 3728c383c5031dce5ae0f5ea53fc47afba71270f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Juuso Alasuutari <juuso.alasuutari@gmail.com>
|
|
||||||
Date: Sun, 14 Aug 2022 18:19:09 +0300
|
|
||||||
Subject: [PATCH 01/10] sched/alt: [Sync] sched/core: Always flush pending
|
|
||||||
blk_plug
|
|
||||||
|
|
||||||
---
|
|
||||||
kernel/sched/alt_core.c | 8 ++++++--
|
|
||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
|
||||||
index 588c7b983e3ba..8a6aa5b7279d3 100644
|
|
||||||
--- a/kernel/sched/alt_core.c
|
|
||||||
+++ b/kernel/sched/alt_core.c
|
|
||||||
@@ -4663,8 +4663,12 @@ static inline void sched_submit_work(struct task_struct *tsk)
|
|
||||||
io_wq_worker_sleeping(tsk);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (tsk_is_pi_blocked(tsk))
|
|
||||||
- return;
|
|
||||||
+ /*
|
|
||||||
+ * spinlock and rwlock must not flush block requests. This will
|
|
||||||
+ * deadlock if the callback attempts to acquire a lock which is
|
|
||||||
+ * already acquired.
|
|
||||||
+ */
|
|
||||||
+ SCHED_WARN_ON(current->__state & TASK_RTLOCK_WAIT);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If we are going to sleep and we have plugged IO queued,
|
|
||||||
|
|
||||||
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,27 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,27 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,28 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
# and fix akmod-nvidia
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
@@ -1,90 +0,0 @@
|
|||||||
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Wed, 4 Jul 2018 04:30:08 +0200
|
|
||||||
Subject: glitched - PDS
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_250
|
|
||||||
+ default HZ_500
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -39,6 +39,13 @@ choice
|
|
||||||
on SMP and NUMA systems and exactly dividing by both PAL and
|
|
||||||
NTSC frame rates for video and multimedia work.
|
|
||||||
|
|
||||||
+ config HZ_500
|
|
||||||
+ bool "500 HZ"
|
|
||||||
+ help
|
|
||||||
+ 500 Hz is a balanced timer frequency. Provides fast interactivity
|
|
||||||
+ on desktops with great smoothness without increasing CPU power
|
|
||||||
+ consumption and sacrificing the battery life on laptops.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -52,6 +59,7 @@ config HZ
|
|
||||||
default 100 if HZ_100
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
+ default 500 if HZ_500
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_500
|
|
||||||
+ default HZ_750
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -46,6 +46,13 @@ choice
|
|
||||||
on desktops with great smoothness without increasing CPU power
|
|
||||||
consumption and sacrificing the battery life on laptops.
|
|
||||||
|
|
||||||
+ config HZ_750
|
|
||||||
+ bool "750 HZ"
|
|
||||||
+ help
|
|
||||||
+ 750 Hz is a good timer frequency for desktops. Provides fast
|
|
||||||
+ interactivity with great smoothness without sacrificing too
|
|
||||||
+ much throughput.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -60,6 +67,7 @@ config HZ
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
default 500 if HZ_500
|
|
||||||
+ default 750 if HZ_750
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/mm/vmscan.c b/mm/vmscan.c
|
|
||||||
index 9270a4370d54..30d01e647417 100644
|
|
||||||
--- a/mm/vmscan.c
|
|
||||||
+++ b/mm/vmscan.c
|
|
||||||
@@ -169,7 +169,7 @@
|
|
||||||
/*
|
|
||||||
* From 0 .. 200. Higher means more swappy.
|
|
||||||
*/
|
|
||||||
-int vm_swappiness = 60;
|
|
||||||
+int vm_swappiness = 20;
|
|
||||||
|
|
||||||
static void set_task_reclaim_state(struct task_struct *task,
|
|
||||||
struct reclaim_state *rs)
|
|
@@ -12,12 +12,12 @@ Subject: [PATCH 01/34] winesync: Introduce the winesync driver and character
|
|||||||
create mode 100644 drivers/misc/winesync.c
|
create mode 100644 drivers/misc/winesync.c
|
||||||
|
|
||||||
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
||||||
index 94e9fb4cdd76..4f9e3d80a6e8 100644
|
index 0f5a49fc7c9e..e21e4424d6a2 100644
|
||||||
--- a/drivers/misc/Kconfig
|
--- a/drivers/misc/Kconfig
|
||||||
+++ b/drivers/misc/Kconfig
|
+++ b/drivers/misc/Kconfig
|
||||||
@@ -496,6 +496,17 @@ config VCPU_STALL_DETECTOR
|
@@ -470,6 +470,17 @@ config OPEN_DICE
|
||||||
|
|
||||||
If you do not intend to run this kernel as a guest, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
+config WINESYNC
|
+config WINESYNC
|
||||||
+ tristate "Synchronization primitives for Wine"
|
+ tristate "Synchronization primitives for Wine"
|
||||||
@@ -34,18 +34,16 @@ index 94e9fb4cdd76..4f9e3d80a6e8 100644
|
|||||||
source "drivers/misc/eeprom/Kconfig"
|
source "drivers/misc/eeprom/Kconfig"
|
||||||
source "drivers/misc/cb710/Kconfig"
|
source "drivers/misc/cb710/Kconfig"
|
||||||
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
|
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
|
||||||
index 2be8542616dd..d061fe45407b 100644
|
index a086197af544..1fb39bc4637b 100644
|
||||||
--- a/drivers/misc/Makefile
|
--- a/drivers/misc/Makefile
|
||||||
+++ b/drivers/misc/Makefile
|
+++ b/drivers/misc/Makefile
|
||||||
@@ -58,6 +58,7 @@ obj-$(CONFIG_HABANA_AI) += habanalabs/
|
@@ -58,5 +58,6 @@ obj-$(CONFIG_HABANA_AI) += habanalabs/
|
||||||
obj-$(CONFIG_UACCE) += uacce/
|
obj-$(CONFIG_UACCE) += uacce/
|
||||||
obj-$(CONFIG_XILINX_SDFEC) += xilinx_sdfec.o
|
obj-$(CONFIG_XILINX_SDFEC) += xilinx_sdfec.o
|
||||||
obj-$(CONFIG_HISI_HIKEY_USB) += hisi_hikey_usb.o
|
obj-$(CONFIG_HISI_HIKEY_USB) += hisi_hikey_usb.o
|
||||||
+obj-$(CONFIG_WINESYNC) += winesync.o
|
+obj-$(CONFIG_WINESYNC) += winesync.o
|
||||||
obj-$(CONFIG_HI6421V600_IRQ) += hi6421v600-irq.o
|
obj-$(CONFIG_HI6421V600_IRQ) += hi6421v600-irq.o
|
||||||
obj-$(CONFIG_OPEN_DICE) += open-dice.o
|
obj-$(CONFIG_OPEN_DICE) += open-dice.o
|
||||||
obj-$(CONFIG_VCPU_STALL_DETECTOR) += vcpu_stall_detector.o
|
|
||||||
\ No newline at end of file
|
|
||||||
diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
|
diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000000..111f33c5676e
|
index 000000000000..111f33c5676e
|
||||||
@@ -117,7 +115,7 @@ index 000000000000..111f33c5676e
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
+MODULE_ALIAS("devname:" WINESYNC_NAME);
|
+MODULE_ALIAS("devname:" WINESYNC_NAME);
|
||||||
--
|
--
|
||||||
2.37.3
|
2.36.0
|
||||||
|
|
||||||
From 1f142d40cb7537bd936a68cadaf0f2a0d94abd62 Mon Sep 17 00:00:00 2001
|
From 1f142d40cb7537bd936a68cadaf0f2a0d94abd62 Mon Sep 17 00:00:00 2001
|
||||||
From: Zebediah Figura <zfigura@codeweavers.com>
|
From: Zebediah Figura <zfigura@codeweavers.com>
|
||||||
@@ -148,10 +146,10 @@ index c07dc0ee860e..4e5abe508426 100644
|
|||||||
|
|
||||||
11 char Raw keyboard device (Linux/SPARC only)
|
11 char Raw keyboard device (Linux/SPARC only)
|
||||||
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
|
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
|
||||||
index 3b985b19f39d..3f313fd4338c 100644
|
index cfe6cccf0f44..d31e014d7bcb 100644
|
||||||
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
|
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
|
||||||
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
|
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
|
||||||
@@ -375,6 +375,8 @@ Code Seq# Include File Comments
|
@@ -371,6 +371,8 @@ Code Seq# Include File Comments
|
||||||
<mailto:thomas@winischhofer.net>
|
<mailto:thomas@winischhofer.net>
|
||||||
0xF6 all LTTng Linux Trace Toolkit Next Generation
|
0xF6 all LTTng Linux Trace Toolkit Next Generation
|
||||||
<mailto:mathieu.desnoyers@efficios.com>
|
<mailto:mathieu.desnoyers@efficios.com>
|
||||||
@@ -2179,10 +2177,10 @@ diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
|
|||||||
index c852eb40c4f7..a366016d6254 100644
|
index c852eb40c4f7..a366016d6254 100644
|
||||||
--- a/tools/testing/selftests/Makefile
|
--- a/tools/testing/selftests/Makefile
|
||||||
+++ b/tools/testing/selftests/Makefile
|
+++ b/tools/testing/selftests/Makefile
|
||||||
@@ -14,6 +14,7 @@ TARGETS += drivers/dma-buf
|
@@ -13,6 +13,7 @@ TARGETS += damon
|
||||||
|
TARGETS += drivers/dma-buf
|
||||||
TARGETS += drivers/s390x/uvdevice
|
TARGETS += drivers/s390x/uvdevice
|
||||||
TARGETS += drivers/net/bonding
|
TARGETS += drivers/net/bonding
|
||||||
TARGETS += drivers/net/team
|
|
||||||
+TARGETS += drivers/winesync
|
+TARGETS += drivers/winesync
|
||||||
TARGETS += efivarfs
|
TARGETS += efivarfs
|
||||||
TARGETS += exec
|
TARGETS += exec
|
||||||
@@ -3284,10 +3282,10 @@ Subject: [PATCH 20/34] maintainers: Add an entry for winesync.
|
|||||||
1 file changed, 9 insertions(+)
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||||
index 72b9654f764c..ff31beb17835 100644
|
index af9530d98717..f51064fca6e9 100644
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -21920,6 +21920,15 @@ M: David Härdeman <david@hardeman.nu>
|
@@ -20536,6 +20536,15 @@ M: David Härdeman <david@hardeman.nu>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/media/rc/winbond-cir.c
|
F: drivers/media/rc/winbond-cir.c
|
||||||
|
|
||||||
@@ -3301,10 +3299,10 @@ index 72b9654f764c..ff31beb17835 100644
|
|||||||
+F: tools/testing/selftests/drivers/winesync/
|
+F: tools/testing/selftests/drivers/winesync/
|
||||||
+
|
+
|
||||||
WINSYSTEMS EBC-C384 WATCHDOG DRIVER
|
WINSYSTEMS EBC-C384 WATCHDOG DRIVER
|
||||||
M: William Breathitt Gray <william.gray@linaro.org>
|
M: William Breathitt Gray <vilhelm.gray@gmail.com>
|
||||||
L: linux-watchdog@vger.kernel.org
|
L: linux-watchdog@vger.kernel.org
|
||||||
--
|
--
|
||||||
2.37.3
|
2.36.0
|
||||||
|
|
||||||
From 4e6e34339182f13972e7b906c0bd0dde74eda3d7 Mon Sep 17 00:00:00 2001
|
From 4e6e34339182f13972e7b906c0bd0dde74eda3d7 Mon Sep 17 00:00:00 2001
|
||||||
From: Zebediah Figura <zfigura@codeweavers.com>
|
From: Zebediah Figura <zfigura@codeweavers.com>
|
||||||
@@ -4495,10 +4493,10 @@ Subject: [PATCH 31/34] winesync: Introduce alertable waits.
|
|||||||
2 files changed, 60 insertions(+), 10 deletions(-)
|
2 files changed, 60 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
|
diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
|
||||||
index 4fbf231a7909..7a28f58dbbf2 100644
|
index 0f8a8a94eef8..64b379d846db 100644
|
||||||
--- a/drivers/misc/winesync.c
|
--- a/drivers/misc/winesync.c
|
||||||
+++ b/drivers/misc/winesync.c
|
+++ b/drivers/misc/winesync.c
|
||||||
@@ -841,10 +841,11 @@ static int setup_wait(struct winesync_device *dev,
|
@@ -842,10 +842,11 @@ static int setup_wait(struct winesync_device *dev,
|
||||||
const __u32 count = args->count;
|
const __u32 count = args->count;
|
||||||
struct winesync_q *q;
|
struct winesync_q *q;
|
||||||
ktime_t timeout = 0;
|
ktime_t timeout = 0;
|
||||||
@@ -4511,7 +4509,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (args->timeout) {
|
if (args->timeout) {
|
||||||
@@ -858,7 +859,11 @@ static int setup_wait(struct winesync_device *dev,
|
@@ -859,7 +860,11 @@ static int setup_wait(struct winesync_device *dev,
|
||||||
timeout = timespec64_to_ns(&to);
|
timeout = timespec64_to_ns(&to);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4524,7 +4522,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
if (!ids)
|
if (!ids)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
if (copy_from_user(ids, u64_to_user_ptr(args->objs),
|
if (copy_from_user(ids, u64_to_user_ptr(args->objs),
|
||||||
@@ -866,8 +871,10 @@ static int setup_wait(struct winesync_device *dev,
|
@@ -867,8 +872,10 @@ static int setup_wait(struct winesync_device *dev,
|
||||||
kfree(ids);
|
kfree(ids);
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
@@ -4536,7 +4534,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
if (!q) {
|
if (!q) {
|
||||||
kfree(ids);
|
kfree(ids);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
@@ -879,7 +886,7 @@ static int setup_wait(struct winesync_device *dev,
|
@@ -880,7 +887,7 @@ static int setup_wait(struct winesync_device *dev,
|
||||||
q->ownerdead = false;
|
q->ownerdead = false;
|
||||||
q->count = count;
|
q->count = count;
|
||||||
|
|
||||||
@@ -4545,7 +4543,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
struct winesync_q_entry *entry = &q->entries[i];
|
struct winesync_q_entry *entry = &q->entries[i];
|
||||||
struct winesync_obj *obj = get_obj(dev, ids[i]);
|
struct winesync_obj *obj = get_obj(dev, ids[i]);
|
||||||
|
|
||||||
@@ -934,9 +941,9 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
@@ -935,9 +942,9 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
||||||
{
|
{
|
||||||
struct winesync_wait_args args;
|
struct winesync_wait_args args;
|
||||||
struct winesync_q *q;
|
struct winesync_q *q;
|
||||||
@@ -4556,7 +4554,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (copy_from_user(&args, argp, sizeof(args)))
|
if (copy_from_user(&args, argp, sizeof(args)))
|
||||||
@@ -946,9 +953,13 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
@@ -947,9 +954,13 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@@ -4571,7 +4569,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
struct winesync_q_entry *entry = &q->entries[i];
|
struct winesync_q_entry *entry = &q->entries[i];
|
||||||
struct winesync_obj *obj = entry->obj;
|
struct winesync_obj *obj = entry->obj;
|
||||||
|
|
||||||
@@ -957,9 +968,15 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
@@ -958,9 +969,15 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
||||||
spin_unlock(&obj->lock);
|
spin_unlock(&obj->lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4589,7 +4587,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
struct winesync_obj *obj = q->entries[i].obj;
|
struct winesync_obj *obj = q->entries[i].obj;
|
||||||
|
|
||||||
if (atomic_read(&q->signaled) != -1)
|
if (atomic_read(&q->signaled) != -1)
|
||||||
@@ -976,7 +993,7 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
@@ -977,7 +994,7 @@ static int winesync_wait_any(struct winesync_device *dev, void __user *argp)
|
||||||
|
|
||||||
/* and finally, unqueue */
|
/* and finally, unqueue */
|
||||||
|
|
||||||
@@ -4598,7 +4596,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
struct winesync_q_entry *entry = &q->entries[i];
|
struct winesync_q_entry *entry = &q->entries[i];
|
||||||
struct winesync_obj *obj = entry->obj;
|
struct winesync_obj *obj = entry->obj;
|
||||||
|
|
||||||
@@ -1036,6 +1053,14 @@ static int winesync_wait_all(struct winesync_device *dev, void __user *argp)
|
@@ -1037,6 +1054,14 @@ static int winesync_wait_all(struct winesync_device *dev, void __user *argp)
|
||||||
*/
|
*/
|
||||||
list_add_tail(&entry->node, &obj->all_waiters);
|
list_add_tail(&entry->node, &obj->all_waiters);
|
||||||
}
|
}
|
||||||
@@ -4613,7 +4611,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
|
|
||||||
/* check if we are already signaled */
|
/* check if we are already signaled */
|
||||||
|
|
||||||
@@ -1043,6 +1068,21 @@ static int winesync_wait_all(struct winesync_device *dev, void __user *argp)
|
@@ -1044,6 +1069,21 @@ static int winesync_wait_all(struct winesync_device *dev, void __user *argp)
|
||||||
|
|
||||||
spin_unlock(&dev->wait_all_lock);
|
spin_unlock(&dev->wait_all_lock);
|
||||||
|
|
||||||
@@ -4635,7 +4633,7 @@ index 4fbf231a7909..7a28f58dbbf2 100644
|
|||||||
/* sleep */
|
/* sleep */
|
||||||
|
|
||||||
ret = winesync_schedule(q, args.timeout ? &timeout : NULL);
|
ret = winesync_schedule(q, args.timeout ? &timeout : NULL);
|
||||||
@@ -1065,6 +1105,16 @@ static int winesync_wait_all(struct winesync_device *dev, void __user *argp)
|
@@ -1066,6 +1106,16 @@ static int winesync_wait_all(struct winesync_device *dev, void __user *argp)
|
||||||
|
|
||||||
put_obj(obj);
|
put_obj(obj);
|
||||||
}
|
}
|
||||||
@@ -4666,7 +4664,7 @@ index fb3788339ffe..5b4e369f7469 100644
|
|||||||
|
|
||||||
#define WINESYNC_IOC_BASE 0xf7
|
#define WINESYNC_IOC_BASE 0xf7
|
||||||
--
|
--
|
||||||
2.37.3
|
2.36.0
|
||||||
|
|
||||||
From 127efad71a0702a68890097b114b3467c234259f Mon Sep 17 00:00:00 2001
|
From 127efad71a0702a68890097b114b3467c234259f Mon Sep 17 00:00:00 2001
|
||||||
From: Zebediah Figura <zfigura@codeweavers.com>
|
From: Zebediah Figura <zfigura@codeweavers.com>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,90 +0,0 @@
|
|||||||
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Wed, 4 Jul 2018 04:30:08 +0200
|
|
||||||
Subject: glitched - BMQ
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_250
|
|
||||||
+ default HZ_500
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -39,6 +39,13 @@ choice
|
|
||||||
on SMP and NUMA systems and exactly dividing by both PAL and
|
|
||||||
NTSC frame rates for video and multimedia work.
|
|
||||||
|
|
||||||
+ config HZ_500
|
|
||||||
+ bool "500 HZ"
|
|
||||||
+ help
|
|
||||||
+ 500 Hz is a balanced timer frequency. Provides fast interactivity
|
|
||||||
+ on desktops with great smoothness without increasing CPU power
|
|
||||||
+ consumption and sacrificing the battery life on laptops.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -52,6 +59,7 @@ config HZ
|
|
||||||
default 100 if HZ_100
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
+ default 500 if HZ_500
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_500
|
|
||||||
+ default HZ_750
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -46,6 +46,13 @@ choice
|
|
||||||
on desktops with great smoothness without increasing CPU power
|
|
||||||
consumption and sacrificing the battery life on laptops.
|
|
||||||
|
|
||||||
+ config HZ_750
|
|
||||||
+ bool "750 HZ"
|
|
||||||
+ help
|
|
||||||
+ 750 Hz is a good timer frequency for desktops. Provides fast
|
|
||||||
+ interactivity with great smoothness without sacrificing too
|
|
||||||
+ much throughput.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -60,6 +67,7 @@ config HZ
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
default 500 if HZ_500
|
|
||||||
+ default 750 if HZ_750
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/mm/vmscan.c b/mm/vmscan.c
|
|
||||||
index 9270a4370d54..30d01e647417 100644
|
|
||||||
--- a/mm/vmscan.c
|
|
||||||
+++ b/mm/vmscan.c
|
|
||||||
@@ -169,7 +169,7 @@
|
|
||||||
/*
|
|
||||||
* From 0 .. 200. Higher means more swappy.
|
|
||||||
*/
|
|
||||||
-int vm_swappiness = 60;
|
|
||||||
+int vm_swappiness = 20;
|
|
||||||
|
|
||||||
static void set_task_reclaim_state(struct task_struct *task,
|
|
||||||
struct reclaim_state *rs)
|
|
@@ -1,18 +0,0 @@
|
|||||||
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
index 6b423eebfd5d..61e3271675d6 100644
|
|
||||||
--- a/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
+++ b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
@@ -21,10 +21,10 @@
|
|
||||||
#include "cpufreq_ondemand.h"
|
|
||||||
|
|
||||||
/* On-demand governor macros */
|
|
||||||
-#define DEF_FREQUENCY_UP_THRESHOLD (80)
|
|
||||||
-#define DEF_SAMPLING_DOWN_FACTOR (1)
|
|
||||||
+#define DEF_FREQUENCY_UP_THRESHOLD (55)
|
|
||||||
+#define DEF_SAMPLING_DOWN_FACTOR (5)
|
|
||||||
#define MAX_SAMPLING_DOWN_FACTOR (100000)
|
|
||||||
-#define MICRO_FREQUENCY_UP_THRESHOLD (95)
|
|
||||||
+#define MICRO_FREQUENCY_UP_THRESHOLD (63)
|
|
||||||
#define MICRO_FREQUENCY_MIN_SAMPLE_RATE (10000)
|
|
||||||
#define MIN_FREQUENCY_UP_THRESHOLD (1)
|
|
||||||
#define MAX_FREQUENCY_UP_THRESHOLD (100)
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,27 +0,0 @@
|
|||||||
# Remove the obsoletes line in kernel-headers
|
|
||||||
# Add provides for kernel-devel so there's no conflict
|
|
||||||
|
|
||||||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
||||||
index 7c477ca7d..1158f5559 100755
|
|
||||||
--- a/scripts/package/mkspec
|
|
||||||
+++ b/scripts/package/mkspec
|
|
||||||
@@ -25,0 +26 @@ fi
|
|
||||||
+PROVIDES_DRM=""
|
|
||||||
@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
|
|
||||||
- PROVIDES=kernel-drm
|
|
||||||
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
||||||
@@ -30 +30,0 @@ fi
|
|
||||||
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
||||||
@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Provides: $PROVIDES
|
|
||||||
+ $PROVIDES_DRM
|
|
||||||
+ Provides: kernel = %{version}
|
|
||||||
+ Provides: kernel-uname-r = %{version}
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
||||||
- Obsoletes: kernel-headers
|
|
||||||
+ Provides: installonlypkg(kernel) = %{version}
|
|
||||||
@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel
|
|
||||||
+$S$M Provides: kernel-devel = %{version}
|
|
||||||
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
||||||
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
Reference in New Issue
Block a user