Commit 2dbbaae5 authored by Linus Torvalds's avatar Linus Torvalds

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
parents f9516259 c4295ab0
...@@ -370,8 +370,6 @@ static int __init xen_guest_init(void) ...@@ -370,8 +370,6 @@ static int __init xen_guest_init(void)
return -ENOMEM; return -ENOMEM;
} }
gnttab_init(); gnttab_init();
if (!xen_initial_domain())
xenbus_probe();
/* /*
* Making sure board specific code will not set up ops for * Making sure board specific code will not set up ops for
......
...@@ -115,7 +115,6 @@ int xenbus_probe_node(struct xen_bus_type *bus, ...@@ -115,7 +115,6 @@ int xenbus_probe_node(struct xen_bus_type *bus,
const char *type, const char *type,
const char *nodename); const char *nodename);
int xenbus_probe_devices(struct xen_bus_type *bus); int xenbus_probe_devices(struct xen_bus_type *bus);
void xenbus_probe(void);
void xenbus_dev_changed(const char *node, struct xen_bus_type *bus); void xenbus_dev_changed(const char *node, struct xen_bus_type *bus);
......
...@@ -683,7 +683,7 @@ void unregister_xenstore_notifier(struct notifier_block *nb) ...@@ -683,7 +683,7 @@ void unregister_xenstore_notifier(struct notifier_block *nb)
} }
EXPORT_SYMBOL_GPL(unregister_xenstore_notifier); EXPORT_SYMBOL_GPL(unregister_xenstore_notifier);
void xenbus_probe(void) static void xenbus_probe(void)
{ {
xenstored_ready = 1; xenstored_ready = 1;
......
...@@ -192,8 +192,6 @@ void xs_suspend_cancel(void); ...@@ -192,8 +192,6 @@ void xs_suspend_cancel(void);
struct work_struct; struct work_struct;
void xenbus_probe(void);
#define XENBUS_IS_ERR_READ(str) ({ \ #define XENBUS_IS_ERR_READ(str) ({ \
if (!IS_ERR(str) && strlen(str) == 0) { \ if (!IS_ERR(str) && strlen(str) == 0) { \
kfree(str); \ kfree(str); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment