Skip to content

Commit

Permalink
version 4.17.5-1
Browse files Browse the repository at this point in the history
Update patches, and drop fixes already included upstream.
  • Loading branch information
marmarek committed Sep 26, 2024
1 parent 9bd2ed9 commit 44e9fd9
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 52 deletions.
11 changes: 1 addition & 10 deletions 0307-x86-Replace-MTRR_-constants-with-X86_MT_-constants.patch
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ index 4e01c8d6f9df6562b94438f265d79a0a6fca8de6..2946003b84938f3b83c98b62dfaa3ace
}

/* If the type is WC, check that this processor supports it */
- if ((type == MTRR_TYPE_WRCOMB) && mtrr_have_wrcomb()) {
- if ((type == MTRR_TYPE_WRCOMB) && !mtrr_have_wrcomb()) {
+ if ((type == X86_MT_WC) && !mtrr_have_wrcomb()) {
printk(KERN_WARNING
"mtrr: your processor doesn't support write-combining\n");
Expand Down Expand Up @@ -279,15 +279,6 @@ index 126437285d8a9f222fca6a7b6ff4434b60637847..bb143c6c42c69db4e054b9156aad9a18
}
/* Force invalid memory type so resolve_misconfig() will split it */
return -1;
@@ -515,7 +515,7 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn,
if ( !mfn_valid(mfn) )
{
*ipat = true;
- return MTRR_TYPE_UNCACHABLE;
+ return X86_MT_UC;
}

/*
@@ -526,7 +526,7 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn,
!cache_flush_permitted(d) )
{
Expand Down
38 changes: 0 additions & 38 deletions 0500-xsa458.patch

This file was deleted.

2 changes: 1 addition & 1 deletion rel
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5
1
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.17.4
4.17.5
3 changes: 1 addition & 2 deletions xen.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ Patch0319: 0319-drivers-char-Use-sub-page-ro-API-to-make-just-xhci-d.patch
Patch0320: 0320-Simplified-version-of-don-t-expose-XENFEAT_hvm_pirqs.patch

# Security fixes
Patch0500: 0500-xsa458.patch

# Upstreamable patches
Patch0604: 0604-libxl-create-writable-error-xenstore-dir.patch
Expand Down Expand Up @@ -454,7 +453,7 @@ CONFIG_EXTRA="$CONFIG_EXTRA --with-system-seabios=/usr/share/seabios/bios-256k.b
%else
CONFIG_EXTRA="$CONFIG_EXTRA --disable-seabios"
%endif
./configure --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --with-system-qemu=/usr/bin/qemu-system-i386 --with-linux-backend-modules="xen-evtchn xen-gntdev xen-gntalloc xen-blkback xen-netback xen-pciback xen-scsiback xen-acpi-processor" $CONFIG_EXTRA
./configure --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --with-system-qemu=/usr/bin/qemu-system-i386 --with-linux-backend-modules="xen-evtchn xen-gntdev xen-gntalloc xen-blkback xen-netback xen-pciback xen-scsiback xen-acpi-processor" --enable-systemd $CONFIG_EXTRA
unset CFLAGS CXXFLAGS FFLAGS LDFLAGS
export LDFLAGS="$LDFLAGS_SAVE"
export CFLAGS="$CFLAGS_SAVE -Wno-error=address"
Expand Down

0 comments on commit 44e9fd9

Please sign in to comment.