diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-12 11:12:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-12 11:12:58 -0800 |
| commit | 2dbbaae5f7b3855697e2decc5de79c7574403254 (patch) | |
| tree | 70ad2de7956c2a35def9e42da4d6b29280902dd1 /arch | |
| parent | f9516259804123c416c4a9de40bc2e14d686478e (diff) | |
| parent | c4295ab0b485b8bc50d2264bcae2acd06f25caaf (diff) | |
Merge tag 'for-linus-5.11-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fix from Juergen Gross:
"A single fix for an issue introduced this development cycle: when
running as a Xen guest on Arm systems the kernel will hang during
boot"
* tag 'for-linus-5.11-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
arm/xen: Don't probe xenbus as part of an early initcall
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/xen/enlighten.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 5a957a9a0984..8ad576ecd0f1 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -370,8 +370,6 @@ static int __init xen_guest_init(void) return -ENOMEM; } gnttab_init(); - if (!xen_initial_domain()) - xenbus_probe(); /* * Making sure board specific code will not set up ops for |