[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[For 4.17] Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled
- To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <Andrew.Cooper3@xxxxxxxxxx>
- Date: Mon, 26 Sep 2022 11:14:22 +0000
- Accept-language: en-GB, en-US
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QCdtDN2pQBs5V5dBUrzXQaVfraSamPBUiVlbDjCvmZU=; b=D9AamGwz3DGqCpIff99JW3J23fVcJ0bidJt62Ick9AwZAp/rm5OoRvxKDHlDyfF9Ney3wPlzHdaY8vYLpVXKXjuQQ6XMMiX4WVVdUNHm3olcVLD9WBq1msSq/l+K04+6iI9YS8a9D8GsAXeJb85BG+/rcTQ878V3i06JC0iZKYzcVRldZfNUIpwutAu5AmbPo7uAA/qgf2MDsHfEMrmrlbPJjkj/uZcT/DIXcY7np6XYdLVnno36eYrx7pVU+mu8l7czh6dCi1HrTw9APjgyaBPdHMjszjcjVew08sf3D0z8tkS6Qps1YeDytGDPRu15wHUWMWPot1DjgVN7f2tJfw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nLsLG0x2x2VPmEdczTHlW8nTCiRo3UsGhN7WRfX8/CVUpsFGg+j4h9LnZgpdnyQ25o7Q+y0XyiTcf3ZvgnwHFW6+wpBCZFOFW2qOXfXg4wCR973te+BtSA++4eTpaptl7zIWo4Avk11rMp08UC61G4Sm/M0uxbhik+qmAvGjSs+f4dISSe2oM8XJCek8VMdqG8QKAaFlBkoqENHoU4tHn/zt6cXf1xXtl5qFqItd/W0h9ZlJzbGbwoyp7Ebs0CBumHjICGvez3kwV4KWMElh56t0e6yAH9DmvYBj9sm3vJLL06h/vWXqVI4j55MUJwY/DX35Ar+uZIgbHheKHa04Sg==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Jan Beulich <JBeulich@xxxxxxxx>, Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>, Henry Wang <Henry.Wang@xxxxxxx>
- Delivery-date: Mon, 26 Sep 2022 11:14:35 +0000
- Ironport-data: A9a23:9XBrlai3lMMZvxs6+dGnflidX161oBEKZh0ujC45NGQN5FlHY01je htvWW+FafeNZGGme95/btmz8B5QuJLRzN5gQFBqpCg3EH8b9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oDJ9CU6j+fQLlbFILasEjhrQgN5QzsWhxtmmuoo6qZlmtH8CA6W0 T/Ii5S31GSNhnglaQr414rZ8Ek15KWo5WtC1rADTasjUGH2xiF94K03fcldH1OgKqFIE+izQ fr0zb3R1gs1KD90V7tJOp6iGqE7aua60Tqm0xK6aID76vR2nQQg075TCRYpQRw/ZwNlPTxG4 I4lWZSYEW/FN0BX8QgXe0Ew/ypWZcWq9FJbSJQWXAP6I0DuKhPRL/tS4E4efr023PllI1h12 9cbDhApMB2GoP2z3+fuIgVsrpxLwMjDGqo64ygl4RSHSPEsTNbEXrnA4sJe0HEonMdSEP3CZ s0fLz1ycBDHZB4JMVASYH48tL7w2j+jLHsF9xTM+vZfD2v7lWSd1JDENtbPd8PMbsJShkuC/ UrN/njjAwFcP9uaodaA2iL02rCUxHiqMG4UPP6q7KEyona+/y9NFUJRTFuigqKVhHfrDrqzL GRRoELCt5Ma5EGtC9XwQRC8iHqFpQIHHcpdFfUg7wOAwbaS5ByWbkAmZDNcbN0ttOctWCcnk FSOmrvBADV1tbSPRHG197GKrCizMywYMW8DYyAfSQIPpdLkpekbrh/JVMclL6ezgfX8AzS2y DePxBXSnJ0WhM8Pkqm+o1bOhmv1ooCTF1FpoALKQmii8wV1Ipa/YJCl4kTa6vAGK5uFSl6Gv z4PnM32AP0yMKxhXRelGI0ldIxFLd7cWNEAqTaDx6Ucygk=
- Ironport-hdrordr: A9a23:+4DvjqwWxfJg5AEahHl5KrPxj+skLtp133Aq2lEZdPULSKGlfp GV9sjziyWetN9IYgBapTiBUJPwIk81bfZOkMQs1MSZLXPbUQyTXc1fBOrZsnfd8kjFmtK1up 0QFJSWZOeQMbE+t7eD3ODaKadu/DDkytHPuQ629R4EIm9XguNbnn5E422gYy9LrXx9dP4E/e 2nl696TlSbGUg/X4CePD0oTuLDr9rEmNbNehgdHSMq7wGIkHeB9KP6OwLw5GZebxp/hZMZtU TVmQ3w4auu99uhzAXH6mPV55NK3PP819p4AtCWgMR9EESttu/oXvUjZ1SxhkFxnAid0idvrD AKmWZmAy1H0QKSQohym2qq5+Cv6kd215ao8y7kvZKqm72EeNt9MbsOuWsRSGqm16Jr1usMr5 5jziaXsYFaAgjHmzm479/UVwtynk7xunY6l/UP5kYvGLf2RYUh2rD3xnklZqsoDWb/8sQqAe NuBMbT6LJfdk6bdWnQui1qzMa3Vno+Ex+aSgxa0/blmAR+jTR81Q8V1cYflnAP+NY0TIRF/f 3NNuBtmKtVRsEbYKphDKMKQNexCGbKXRXQWVjiaWjPBeUCITbAupT36LI66KWjf4EJ1oI7nN DbXFZRpQcJCjbT4A21reh2Gzz2MRaAtG7Wu7BjDrBCy83BbauuNzGfQ1YzlMblq+kDA6TgKo SOBK4=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Thread-index: AQHY0ZgJqCa/HgBJ80OfcMoFcfGuLq3xjxEA
- Thread-topic: [For 4.17] Re: [PATCH] drivers/char: Fix build when CET-IBT is enabled
On 26/09/2022 12:05, Andrew Cooper wrote:
> https://gitlab.com/xen-project/xen/-/jobs/3083068950#L1763
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> Fixes: 022e40edd4dc ("drivers/char: allow using both dbgp=xhci and dbgp=ehci")
> ---
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
> CC: Henry Wang <Henry.Wang@xxxxxxx>
Sorry - forgot to tag For-4.17 in the subject.
~Andrew
> ---
> xen/drivers/char/ehci-dbgp.c | 2 +-
> xen/drivers/char/xhci-dbc.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
> index 8a0b95850609..bb9d3198d9f2 100644
> --- a/xen/drivers/char/ehci-dbgp.c
> +++ b/xen/drivers/char/ehci-dbgp.c
> @@ -1465,7 +1465,7 @@ static struct ehci_dbgp ehci_dbgp = { .state =
> dbgp_unsafe, .phys_port = 1 };
>
> static char __initdata opt_dbgp[30];
>
> -static int __init parse_ehci_dbgp(const char *opt)
> +static int __init cf_check parse_ehci_dbgp(const char *opt)
> {
> if ( strncmp(opt, "ehci", 4) )
> return 0;
> diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c
> index 5f92234a9594..43ed64a004e2 100644
> --- a/xen/drivers/char/xhci-dbc.c
> +++ b/xen/drivers/char/xhci-dbc.c
> @@ -1282,7 +1282,7 @@ struct dbc_dma_bufs {
> static struct dbc_dma_bufs __section(".bss.page_aligned")
> __aligned(PAGE_SIZE)
> dbc_dma_bufs;
>
> -static int __init xhci_parse_dbgp(const char *opt_dbgp)
> +static int __init cf_check xhci_parse_dbgp(const char *opt_dbgp)
> {
> struct dbc_uart *uart = &dbc_uart;
> struct dbc *dbc = &uart->dbc;
|
