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 /include | |
| parent | f9516259804123c416c4a9de40bc2e14d686478e (diff) | |
| parent | c4295ab0b485b8bc50d2264bcae2acd06f25caaf (diff) | |
| download | linux-2dbbaae5f7b3855697e2decc5de79c7574403254.tar.bz2 | |
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 'include')
| -rw-r--r-- | include/xen/xenbus.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 2c43b0ef1e4d..bf3cfc7c35d0 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -192,8 +192,6 @@ void xs_suspend_cancel(void); struct work_struct; -void xenbus_probe(void); - #define XENBUS_IS_ERR_READ(str) ({ \ if (!IS_ERR(str) && strlen(str) == 0) { \ kfree(str); \ |