diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 09:31:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 09:31:07 -0700 |
| commit | 5b4c0d87de2d4932354ebcf118677c94533f9a01 (patch) | |
| tree | 292a9d90deaa4fc373bf8bb63c48117cbbc96fee /arch/x86/xen/xen-pvh.S | |
| parent | c2101d01826480755f2bd9f3dd5e36757be61e23 (diff) | |
| parent | 7a048cec598e1761cdcd63eb3a3c6e390b7661c7 (diff) | |
| download | blackbird-obmc-linux-5b4c0d87de2d4932354ebcf118677c94533f9a01.tar.gz blackbird-obmc-linux-5b4c0d87de2d4932354ebcf118677c94533f9a01.zip | |
Merge tag 'for-linus-4.20a-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Only several small fixes and cleanups this time"
* tag 'for-linus-4.20a-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: drop writing error messages to xenstore
xen/pvh: don't try to unplug emulated devices
add myself as reviewer for Xen support in Linux
xen: remove redundant 'default n' from Kconfig
xen/balloon: Support xend-based toolstack
xen/pvh: increase early stack size
xen: make xen_qlock_wait() nestable
xen: fix race in xen_qlock_wait()
xen/balloon: Grammar s/Is it/It is/
xen: Make XEN_BACKEND selectable by DomU
Diffstat (limited to 'arch/x86/xen/xen-pvh.S')
| -rw-r--r-- | arch/x86/xen/xen-pvh.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/xen/xen-pvh.S index b0e471506cd8..1f8825bbaffb 100644 --- a/arch/x86/xen/xen-pvh.S +++ b/arch/x86/xen/xen-pvh.S @@ -170,7 +170,7 @@ canary: .fill 48, 1, 0 early_stack: - .fill 256, 1, 0 + .fill BOOT_STACK_SIZE, 1, 0 early_stack_end: ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY, |
