QubesOS/qubes-linux-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop AFTER_LINK patch

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-07-27 23:01:02 +02:00
parent 150288eaa4
commit d9f5315ada
16 changed files with 58 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
0001-kbuild-AFTER_LINK.patch
View File

@ -1,66 +0,0 @@
From f06e0fe77c3518568bcf4755981acd24c1a993c2 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 6 Oct 2008 23:03:03 -0700
Subject: [PATCH] kbuild: AFTER_LINK
If the make variable AFTER_LINK is set, it is a command line to run
after each final link. This includes vmlinux itself and vDSO images.
Bugzilla: N/A
Upstream-status: ??
Signed-off-by: Roland McGrath <roland@redhat.com>
---
arch/arm64/kernel/vdso/Makefile | 3 ++-
arch/x86/entry/vdso/Makefile | 5 +++--
scripts/link-vmlinux.sh | 4 ++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
index fa230ff09aa1..ab668b5e07cd 100644
--- a/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S FORCE
# Actual build commands
quiet_cmd_vdsoas = VDSOA $@
- cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
+ cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $< \
+ $(if $(AFTER_LINK),;$(AFTER_LINK))
# Install commands for the unstripped file
quiet_cmd_vdso_install = INSTALL $@
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 42fe42e82baf..c38a827a7c90 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \
quiet_cmd_vdso = VDSO $@
cmd_vdso = $(LD) -nostdlib -o $@ \
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
- -T $(filter %.lds,$^) $(filter %.o,$^) && \
- sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
+ -T $(filter %.lds,$^) $(filter %.o,$^) \
+ $(if $(AFTER_LINK),; $(AFTER_LINK)) && \
+ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
$(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index a7124f895b24..8a3f116a7d86 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -89,6 +89,10 @@ vmlinux_link()
-lutil -lrt -lpthread
rm -f linux
fi
+ if [ -n "${AFTER_LINK}" ]; then
+ /usr/lib/rpm/debugedit -b ${RPM_BUILD_DIR} -d /usr/src/debug -i ${2} \
+ > ${2}.id
+ fi
}
# generate .BTF typeinfo from DWARF debuginfo
--
2.20.1

6
0002-xen-netfront-detach-crash.patch → 0001-xen-netfront-detach-crash.patch
View File

@ -1,4 +1,4 @@
From 1aa7dd7bf8f02b5447a63182bd45a96da25de4f1 Mon Sep 17 00:00:00 2001
From 32862c02a282688aa2b6eaf51e53a1a5cbd16bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Thu, 6 Sep 2018 15:09:44 +0200
@ -16,10 +16,10 @@ http://xen.markmail.org/thread/pw5edbtqienjx4q5
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index c914c24f880b..f1688897b256 100644
index 8d33970a2950..5c9a0226dc8d 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1138,9 +1138,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
@@ -1137,9 +1137,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
skb = queue->tx_skbs[i].skb;
get_page(queue->grant_tx_page[i]);

8
0003-mce-hide-EBUSY-initialization-error-on-Xen.patch → 0002-mce-hide-EBUSY-initialization-error-on-Xen.patch
View File

@ -1,4 +1,4 @@
From 791f22b92868334abf94870eba965ffcd3a34130 Mon Sep 17 00:00:00 2001
From 41289a67b087a0d55740334fc0f321398408d784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Tue, 5 Jan 2016 02:44:04 +0100
@ -39,10 +39,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 9 insertions(+)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index b7fb541a4873..1947eb18d874 100644
index 282916f3b8d8..2d6b4703339a 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -50,6 +50,10 @@
@@ -51,6 +51,10 @@
#include <asm/msr.h>
#include <asm/reboot.h>
@ -53,7 +53,7 @@ index b7fb541a4873..1947eb18d874 100644
#include "internal.h"
static DEFINE_MUTEX(mce_log_mutex);
@@ -2376,6 +2380,11 @@ static __init int mcheck_init_device(void)
@@ -2389,6 +2393,11 @@ static __init int mcheck_init_device(void)
free_cpumask_var(mce_device_initialized);
err_out:

6
0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch → 0003-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
View File

@ -1,4 +1,4 @@
From d4a2de0378cb95512e61a6f6af542b92ec4fda76 Mon Sep 17 00:00:00 2001
From 7a3613a04ae9fc5d4e454ef50bffc11128409be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Sat, 30 Jan 2016 01:53:26 +0100
@ -10,10 +10,10 @@ Ease debugging of PCI passthrough problems.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 117e76b2f939..34f380be2b34 100644
index 2e8570c09789..7494ff7b238a 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -521,7 +521,7 @@ static unsigned int __startup_pirq(unsigned int irq)
@@ -522,7 +522,7 @@ static unsigned int __startup_pirq(unsigned int irq)
BIND_PIRQ__WILL_SHARE : 0;
rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
if (rc != 0) {

4
0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch → 0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch
View File

@ -1,4 +1,4 @@
From 82b169276e10dc42c5bb8666eefd97dacf4bfc7e Mon Sep 17 00:00:00 2001
From c1fccb4d29f2fb1362810d840d2ef9ee2f2ef4d7 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 11 Jun 2012 22:49:31 +0200
Subject: [PATCH] pvops: respect 'removable' xenstore flag for block devices
@ -10,7 +10,7 @@ by normal user.
1 file changed, 7 insertions(+)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index d43a5677ccbc..a8df7688673a 100644
index a74d03913822..e76b999fceca 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2339,6 +2339,7 @@ static void blkfront_connect(struct blkfront_info *info)

4
0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch → 0005-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch
View File

@ -1,4 +1,4 @@
From eac56ff23482839805609d61ae8a7c1e325b4fe0 Mon Sep 17 00:00:00 2001
From 29e33e1e21f1ef1f1e04483bca05e37a798360ee Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sun, 15 Jul 2012 19:57:47 +0200
Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
@ -8,7 +8,7 @@ Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
1 file changed, 4 insertions(+)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index a8df7688673a..b71f03a684ee 100644
index e76b999fceca..db7d28ac9747 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -47,6 +47,7 @@

8
0007-block-add-no_part_scan-module-parameter.patch → 0006-block-add-no_part_scan-module-parameter.patch
View File

@ -1,4 +1,4 @@
From e6678551bfaed27e7c22877afd15a542c1d5d13f Mon Sep 17 00:00:00 2001
From 10a2635f42ee839b3ffa6d67f5ae622ca9a09f60 Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@openmailbox.org>
Date: Mon, 11 Jul 2016 13:05:38 +0000
Subject: [PATCH] block: add no_part_scan module parameter
@ -15,10 +15,10 @@ the /sys/module/block/parameters/no_part_scan file.
1 file changed, 12 insertions(+)
diff --git a/block/genhd.c b/block/genhd.c
index 703267865f14..d23df3adf080 100644
index 24654e1d83e6..ce06da45aecd 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -663,6 +663,15 @@ static void register_disk(struct device *parent, struct gendisk *disk,
@@ -676,6 +676,15 @@ static void register_disk(struct device *parent, struct gendisk *disk,
}
}
@ -34,7 +34,7 @@ index 703267865f14..d23df3adf080 100644
/**
* __device_add_disk - add disk information to kernel list
* @parent: parent device for the disk
@@ -682,6 +691,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
@@ -695,6 +704,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
dev_t devt;
int retval;

2
0008-xen-Add-RING_COPY_RESPONSE.patch → 0007-xen-Add-RING_COPY_RESPONSE.patch
View File

@ -1,4 +1,4 @@
From 8ed84d55e0fab9af237e3506ac23b6c5a08f49f8 Mon Sep 17 00:00:00 2001
From 28ff22aa85bfbe4cc535ffbcc4cf45a271e1ff70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Tue, 15 Dec 2015 21:35:14 +0100

22
0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch → 0008-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
View File

@ -1,4 +1,4 @@
From 451fe08638b8bb5c7579ef66d763b796e2345d3c Mon Sep 17 00:00:00 2001
From 6c7b9e32eb26ad5c535126c8775e2e4c68b0d57a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:09:55 +0100
@ -18,7 +18,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index f1688897b256..4d8d53862d1b 100644
index 5c9a0226dc8d..b981a17f2edd 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -385,13 +385,13 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
@ -39,7 +39,7 @@ index f1688897b256..4d8d53862d1b 100644
skb = queue->tx_skbs[id].skb;
if (unlikely(gnttab_query_foreign_access(
queue->grant_tx_ref[id]) != 0)) {
@@ -740,7 +740,7 @@ static int xennet_get_extras(struct netfront_queue *queue,
@@ -739,7 +739,7 @@ static int xennet_get_extras(struct netfront_queue *queue,
RING_IDX rp)
{
@ -48,7 +48,7 @@ index f1688897b256..4d8d53862d1b 100644
struct device *dev = &queue->info->netdev->dev;
RING_IDX cons = queue->rx.rsp_cons;
int err = 0;
@@ -756,24 +756,23 @@ static int xennet_get_extras(struct netfront_queue *queue,
@@ -755,24 +755,23 @@ static int xennet_get_extras(struct netfront_queue *queue,
break;
}
@ -80,7 +80,7 @@ index f1688897b256..4d8d53862d1b 100644
queue->rx.rsp_cons = cons;
return err;
@@ -783,28 +782,28 @@ static int xennet_get_responses(struct netfront_queue *queue,
@@ -782,28 +781,28 @@ static int xennet_get_responses(struct netfront_queue *queue,
struct netfront_rx_info *rinfo, RING_IDX rp,
struct sk_buff_head *list)
{
@ -115,7 +115,7 @@ index f1688897b256..4d8d53862d1b 100644
xennet_move_rx_slot(queue, skb, ref);
err = -EINVAL;
goto next;
@@ -818,7 +817,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
@@ -817,7 +816,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
if (ref == GRANT_INVALID_REF) {
if (net_ratelimit())
dev_warn(dev, "Bad rx response id %d.\n",
@ -124,7 +124,7 @@ index f1688897b256..4d8d53862d1b 100644
err = -EINVAL;
goto next;
}
@@ -831,7 +830,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
@@ -830,7 +829,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
__skb_queue_tail(list, skb);
next:
@ -133,7 +133,7 @@ index f1688897b256..4d8d53862d1b 100644
break;
if (cons + slots == rp) {
@@ -841,7 +840,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
@@ -840,7 +839,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
break;
}
@ -142,7 +142,7 @@ index f1688897b256..4d8d53862d1b 100644
skb = xennet_get_rx_skb(queue, cons + slots);
ref = xennet_get_rx_ref(queue, cons + slots);
slots++;
@@ -896,9 +895,9 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
@@ -895,9 +894,9 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
struct sk_buff *nskb;
while ((nskb = __skb_dequeue(list))) {
@ -154,7 +154,7 @@ index f1688897b256..4d8d53862d1b 100644
if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) {
unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to;
@@ -914,7 +913,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
@@ -913,7 +912,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
skb_frag_page(nfrag),
@ -163,7 +163,7 @@ index f1688897b256..4d8d53862d1b 100644
skb_shinfo(nskb)->nr_frags = 0;
kfree_skb(nskb);
@@ -1010,7 +1009,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)
@@ -1009,7 +1008,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)
i = queue->rx.rsp_cons;
work_done = 0;
while ((i != rp) && (work_done < budget)) {

8
0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch → 0009-xen-netfront-do-not-use-data-already-exposed-to-back.patch
View File

@ -1,4 +1,4 @@
From bdda44ef5cc1ed1929e4ae193a1cc85cf5db45df Mon Sep 17 00:00:00 2001
From 9dac7f65e7ce9ba42a3edfa24a87b18bd484ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:19:37 +0100
@ -20,7 +20,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 4d8d53862d1b..834a7950bea1 100644
index b981a17f2edd..66e972918f5b 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -456,7 +456,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
@ -32,7 +32,7 @@ index 4d8d53862d1b..834a7950bea1 100644
}
static struct xen_netif_tx_request *xennet_make_first_txreq(
@@ -573,7 +573,7 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
@@ -572,7 +572,7 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
int slots;
struct page *page;
unsigned int offset;
@ -41,7 +41,7 @@ index 4d8d53862d1b..834a7950bea1 100644
unsigned long flags;
struct netfront_queue *queue = NULL;
unsigned int num_queues = dev->real_num_tx_queues;
@@ -633,14 +633,15 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
@@ -632,14 +632,15 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
}
/* First request for the linear area. */

4
0011-xen-netfront-add-range-check-for-Tx-response-id.patch → 0010-xen-netfront-add-range-check-for-Tx-response-id.patch
View File

@ -1,4 +1,4 @@
From d81bcfcdadd17347a661d1379960d3144d2f69fa Mon Sep 17 00:00:00 2001
From 9b0c48ef89505f95f495fc1d48ee2f489b657999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:22:24 +0100
@ -19,7 +19,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 1 insertion(+)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 834a7950bea1..a429ab24114b 100644
index 66e972918f5b..a8a5da7461fc 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -392,6 +392,7 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)

4
0012-xen-blkfront-make-local-copy-of-response-before-usin.patch → 0011-xen-blkfront-make-local-copy-of-response-before-usin.patch
View File

@ -1,4 +1,4 @@
From f65e1229bf1ad7925618d195fa1b79a7d5ec2c51 Mon Sep 17 00:00:00 2001
From e0da6b06520aafefa2809098f4b993a04e70abee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:51:10 +0100
@ -20,7 +20,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index b71f03a684ee..8bd9fc13f6c9 100644
index db7d28ac9747..3f6dbaf0265b 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1551,7 +1551,7 @@ static bool blkif_completion(unsigned long *id,

4
0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch → 0012-xen-blkfront-prepare-request-locally-only-then-put-i.patch
View File

@ -1,4 +1,4 @@
From 53b58dbc83cdbfb8cb06636b4a150d0a832836f5 Mon Sep 17 00:00:00 2001
From 752af3d52ee9cc908988683cdd776152652e21d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 06:07:14 +0100
@ -22,7 +22,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 44 insertions(+), 32 deletions(-)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 8bd9fc13f6c9..08d565b193ba 100644
index 3f6dbaf0265b..37235ab63ca9 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -527,19 +527,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,

6
0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch → 0013-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
View File

@ -1,4 +1,4 @@
From 412a7ffe316ed4803553cef9cf4fb7a0a02b7f31 Mon Sep 17 00:00:00 2001
From ae98e33fcffb88d43732018c3a7427c41f6acd5c Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 1 Apr 2015 17:01:26 -0400
Subject: [PATCH] xen/pcifront/pciback: Update pciif.h with ->err and ->result
@ -21,10 +21,10 @@ https://patchwork.kernel.org/patch/8258431/
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index eba6e33147a2..cc6dcb13f1a8 100644
index d1b16cf3403f..4d6f2513b104 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -298,7 +298,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
@@ -297,7 +297,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
} else {
pci_err(dev, "enable msix get err %x\n", err);
}

2
0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch → 0014-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
View File

@ -1,4 +1,4 @@
From 447afa1fafa01e66cabb4d42a5ffe3d851f8989f Mon Sep 17 00:00:00 2001
From 5fa9a8629bacf9c61e236f517ae67e18f0f4b5d4 Mon Sep 17 00:00:00 2001
From: HW42 <hw42@ipsumj.de>
Date: Tue, 12 Sep 2017 00:49:02 +0200
Subject: [PATCH] xen-pciback: add attribute to allow MSI enable flag writes

39
kernel.spec.in
View File

@ -104,21 +104,20 @@ Source34: gen-config
Source100: config-base
Source101: config-qubes
Patch0: 0001-kbuild-AFTER_LINK.patch
Patch1: 0002-xen-netfront-detach-crash.patch
Patch2: 0003-mce-hide-EBUSY-initialization-error-on-Xen.patch
Patch3: 0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
Patch4: 0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch
Patch5: 0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch
Patch6: 0007-block-add-no_part_scan-module-parameter.patch
Patch7: 0008-xen-Add-RING_COPY_RESPONSE.patch
Patch8: 0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
Patch9: 0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch
Patch10: 0011-xen-netfront-add-range-check-for-Tx-response-id.patch
Patch11: 0012-xen-blkfront-make-local-copy-of-response-before-usin.patch
Patch12: 0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch
Patch13: 0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
Patch14: 0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
Patch0: 0001-xen-netfront-detach-crash.patch
Patch1: 0002-mce-hide-EBUSY-initialization-error-on-Xen.patch
Patch2: 0003-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
Patch3: 0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch
Patch4: 0005-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch
Patch5: 0006-block-add-no_part_scan-module-parameter.patch
Patch6: 0007-xen-Add-RING_COPY_RESPONSE.patch
Patch7: 0008-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
Patch8: 0009-xen-netfront-do-not-use-data-already-exposed-to-back.patch
Patch9: 0010-xen-netfront-add-range-check-for-Tx-response-id.patch
Patch10: 0011-xen-blkfront-make-local-copy-of-response-before-usin.patch
Patch11: 0012-xen-blkfront-prepare-request-locally-only-then-put-i.patch
Patch12: 0013-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
Patch13: 0014-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
%description
Qubes Dom0 kernel.
@ -179,16 +178,6 @@ mv %_builddir/$(basename %{SOURCE5} .tar.xz) %_builddir/wireguard
cd %kernel_build_dir
# This override tweaks the kernel makefiles so that we run debugedit on an
# object before embedding it. When we later run find-debuginfo.sh, it will
# run debugedit again. The edits it does change the build ID bits embedded
# in the stripped object, but repeating debugedit is a no-op. We do it
# beforehand to get the proper final build ID bits into the embedded image.
# This affects the vDSO images in vmlinux, and the vmlinux image in bzImage.
export AFTER_LINK=\
'sh -xc "/usr/lib/rpm/debugedit -b $$RPM_BUILD_DIR -d /usr/src/debug \
-i $@ > $@.id"'
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
# Build u2mfn module