diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-02 12:15:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-02 12:15:55 -0800 |
| commit | 292974c5acae330186cbf5a833385f666aeb12c0 (patch) | |
| tree | 503003e9b7034449ac29b4f6705d7f251b14cad0 /include | |
| parent | a234c7371fd8a71faa000745ce6ffee05e1dc07a (diff) | |
| parent | 975ef94a0284648fb0137bd5e949b18cef604e33 (diff) | |
Merge tag 'for-linus-4.20a-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- A revert of a previous commit as it is no longer necessary and has
shown to cause problems in some memory hotplug cases.
- Some small fixes and a minor cleanup.
- A patch for adding better diagnostic data in a very rare failure
case.
* tag 'for-linus-4.20a-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
pvcalls-front: fixes incorrect error handling
Revert "xen/balloon: Mark unallocated host memory as UNUSABLE"
xen: xlate_mmu: add missing header to fix 'W=1' warning
xen/x86: add diagnostic printout to xen_mc_flush() in case of error
x86/xen: cleanup includes in arch/x86/xen/spinlock.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/balloon.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/xen/balloon.h b/include/xen/balloon.h index 61f410fd74e4..4914b93a23f2 100644 --- a/include/xen/balloon.h +++ b/include/xen/balloon.h @@ -44,8 +44,3 @@ static inline void xen_balloon_init(void) { } #endif - -#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG -struct resource; -void arch_xen_balloon_init(struct resource *hostmem_resource); -#endif |