Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit f83e38f

Browse files
committed
Merge tag 'for-linus-6.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross: - some trivial cleanups - a fix for the Xen timer - add boot time selectable debug capability to the Xen multicall handling - two fixes for the recently added Xen irqfd handling * tag 'for-linus-6.11-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: remove deprecated xen_nopvspin boot parameter x86/xen: eliminate some private header files x86/xen: make some functions static xen: make multicall debug boot time selectable xen/arm: Convert comma to semicolon xen: privcmd: Fix possible access to a freed kirqfd instance xen: privcmd: Switch from mutex to spinlock for irqfds xen: add missing MODULE_DESCRIPTION() macros x86/xen: Convert comma to semicolon x86/xen/time: Reduce Xen timer tick xen/manage: Constify struct shutdown_handler
2 parents e55037c + 9fe6a8c commit f83e38f

33 files changed

+305
-276
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7420,17 +7420,18 @@
74207420
Crash from Xen panic notifier, without executing late
74217421
panic() code such as dumping handler.
74227422

7423+
xen_mc_debug [X86,XEN,EARLY]
7424+
Enable multicall debugging when running as a Xen PV guest.
7425+
Enabling this feature will reduce performance a little
7426+
bit, so it should only be enabled for obtaining extended
7427+
debug data in case of multicall errors.
7428+
74237429
xen_msr_safe= [X86,XEN,EARLY]
74247430
Format: <bool>
74257431
Select whether to always use non-faulting (safe) MSR
74267432
access functions when running as Xen PV guest. The
74277433
default value is controlled by CONFIG_XEN_PV_MSR_SAFE.
74287434

7429-
xen_nopvspin [X86,XEN,EARLY]
7430-
Disables the qspinlock slowpath using Xen PV optimizations.
7431-
This parameter is obsoleted by "nopvspin" parameter, which
7432-
has equivalent effect for XEN platform.
7433-
74347435
xen_nopv [X86]
74357436
Disables the PV optimizations forcing the HVM guest to
74367437
run as generic HVM guest with no PV drivers.

arch/arm/xen/p2m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
109109
* immediate unmapping.
110110
*/
111111
map_ops[i].status = GNTST_general_error;
112-
unmap.host_addr = map_ops[i].host_addr,
112+
unmap.host_addr = map_ops[i].host_addr;
113113
unmap.handle = map_ops[i].handle;
114114
map_ops[i].handle = INVALID_GRANT_HANDLE;
115115
if (map_ops[i].flags & GNTMAP_device_map)

arch/x86/xen/apic.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include <xen/xen.h>
1111
#include <xen/interface/physdev.h>
1212
#include "xen-ops.h"
13-
#include "pmu.h"
14-
#include "smp.h"
1513

1614
static unsigned int xen_io_apic_read(unsigned apic, unsigned reg)
1715
{

arch/x86/xen/debugfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <linux/debugfs.h>
44
#include <linux/slab.h>
55

6-
#include "debugfs.h"
6+
#include "xen-ops.h"
77

88
static struct dentry *d_xen_debug;
99

arch/x86/xen/debugfs.h

Lines changed: 0 additions & 7 deletions
This file was deleted.

arch/x86/xen/enlighten.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include <asm/setup.h>
2121

2222
#include "xen-ops.h"
23-
#include "smp.h"
24-
#include "pmu.h"
2523

2624
EXPORT_SYMBOL_GPL(hypercall_page);
2725

arch/x86/xen/enlighten_hvm.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
#include <asm/xen/page.h>
2929

3030
#include "xen-ops.h"
31-
#include "mmu.h"
32-
#include "smp.h"
3331

3432
static unsigned long shared_info_pfn;
3533

arch/x86/xen/enlighten_pv.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@
8585
#endif
8686

8787
#include "xen-ops.h"
88-
#include "mmu.h"
89-
#include "smp.h"
90-
#include "multicalls.h"
91-
#include "pmu.h"
9288

9389
#include "../kernel/cpu/cpu.h" /* get_cpu_cap() */
9490

arch/x86/xen/mmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
#include <asm/xen/hypercall.h>
66
#include <xen/interface/memory.h>
77

8-
#include "multicalls.h"
9-
#include "mmu.h"
8+
#include "xen-ops.h"
109

1110
unsigned long arbitrary_virt_to_mfn(void *vaddr)
1211
{

arch/x86/xen/mmu.h

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)