The patch titled From: Jeremy Fitzhardinge <jeremy@xxxxxxxx> has been added to the -mm tree. Its filename is xen-paravirt_ops-add-early-printk-support-via-hvc-console.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: From: Jeremy Fitzhardinge <jeremy@xxxxxxxx> From: Gerd Hoffmann <kraxel@xxxxxxx> Add early printk support via hvc console, enable using "earlyprintk=xen" on the kernel command line. Signed-off-by: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx> --- =================================================================== Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86_64/kernel/early_printk.c | 8 ++++++++ drivers/xen/hvc-console.c | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff -puN arch/x86_64/kernel/early_printk.c~xen-paravirt_ops-add-early-printk-support-via-hvc-console arch/x86_64/kernel/early_printk.c --- a/arch/x86_64/kernel/early_printk.c~xen-paravirt_ops-add-early-printk-support-via-hvc-console +++ a/arch/x86_64/kernel/early_printk.c @@ -197,6 +197,10 @@ static struct console simnow_console = { .index = -1, }; +#ifdef CONFIG_XEN +extern struct console xenboot_console; +#endif + /* Direct interface for emergencies */ struct console *early_console = &early_vga_console; static int early_console_initialized = 0; @@ -243,6 +247,10 @@ static int __init setup_early_printk(cha simnow_init(buf + 6); early_console = &simnow_console; keep_early = 1; +#ifdef CONFIG_XEN + } else if (!strncmp(buf, "xen", 3)) { + early_console = &xenboot_console; +#endif } if (keep_early) diff -puN drivers/xen/hvc-console.c~xen-paravirt_ops-add-early-printk-support-via-hvc-console drivers/xen/hvc-console.c --- a/drivers/xen/hvc-console.c~xen-paravirt_ops-add-early-printk-support-via-hvc-console +++ a/drivers/xen/hvc-console.c @@ -132,3 +132,27 @@ static int xen_cons_init(void) module_init(xen_init); module_exit(xen_fini); console_initcall(xen_cons_init); + +static void xenboot_write_console(struct console *console, const char *string, + unsigned len) +{ + unsigned int linelen, off = 0; + const char *pos; + + while (off < len && NULL != (pos = strchr(string+off, '\n'))) { + linelen = pos-string+off; + if (off + linelen > len) + break; + write_console(0, string+off, linelen); + write_console(0, "\r\n", 2); + off += linelen + 1; + } + if (off < len) + write_console(0, string+off, len-off); +} + +struct console xenboot_console = { + .name = "xenboot", + .write = xenboot_write_console, + .flags = CON_PRINTBUFFER | CON_BOOT, +}; _ Patches currently in -mm which might be from jeremy@xxxxxxxx are xen-paravirt_ops-no-need-to-use-traditional-for-processing-asm-in-arch-i386.patch xen-paravirt_ops-clean-up-elf-note-generation.patch xen-paravirt_ops-fix-typo-in-sync_constant_test_bits-name.patch xen-paravirt_ops-ignore-vgacon-if-hardware-not-present.patch xen-paravirt_ops-add-pagetable-accessors-to-pack-and-unpack-pagetable-entries.patch xen-paravirt_ops-paravirt_ops-hooks-to-set-up-initial-pagetable.patch xen-paravirt_ops-paravirt_ops-allocate-a-fixmap-slot.patch xen-paravirt_ops-allow-paravirt-backend-to-choose-kernel-pmd-sharing.patch xen-paravirt_ops-add-hooks-to-intercept-mm-creation-and-destruction.patch xen-paravirt_ops-remove-have_arch_mm_lifetime-define-no-op-architecture-implementations.patch xen-paravirt_ops-add-apply_to_page_range-which-applies-a-function-to-a-pte-range.patch xen-paravirt_ops-allocate-and-free-vmalloc-areas.patch xen-paravirt_ops-add-nosegneg-capability-to-the-vsyscall-page-notes.patch xen-paravirt_ops-add-xen-config-options.patch xen-paravirt_ops-add-xen-interface-header-files.patch xen-paravirt_ops-core-xen-implementation.patch xen-paravirt_ops-some-generic-early-printk-boot-console-fixups.patch xen-paravirt_ops-use-the-hvc-console-infrastructure-for-xen-console.patch xen-paravirt_ops-add-early-printk-support-via-hvc-console.patch xen-paravirt_ops-add-xen-grant-table-support.patch xen-paravirt_ops-add-the-xenbus-sysfs-and-virtual-device-hotplug-driver.patch xen-paravirt_ops-add-xen-virtual-block-device-driver.patch xen-paravirt_ops-add-the-xen-virtual-network-device-driver.patch fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html