From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pw0-f51.google.com (mail-pw0-f51.google.com [209.85.160.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 7D8EBB7108 for ; Sat, 11 Jun 2011 11:57:58 +1000 (EST) Received: by pwi9 with SMTP id 9so1550515pwi.38 for ; Fri, 10 Jun 2011 18:57:55 -0700 (PDT) From: Dave Carroll To: Milton Miller , BenH Subject: [PATCH 2/2] powerpc: Add printk companion for ppc_md.progress Date: Fri, 10 Jun 2011 19:38:11 -0600 Message-Id: <1307756291-26513-2-git-send-email-dcarroll@astekcorp.com> In-Reply-To: <1307756291-26513-1-git-send-email-dcarroll@astekcorp.com> References: <1307756291-26513-1-git-send-email-dcarroll@astekcorp.com> Cc: Dave Carroll , LPPC , LKML List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Dave Carroll This patch adds a printk companion to replace the udbg progress function when initmem is freed. Suggested-by: Milton Miller Suggested-by: Benjamin Herrenschmidt Signed-off-by: Dave Carroll --- arch/powerpc/include/asm/setup.h | 2 ++ arch/powerpc/kernel/setup-common.c | 5 +++++ arch/powerpc/mm/mem.c | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h index dae1934..c77cb7a 100644 --- a/arch/powerpc/include/asm/setup.h +++ b/arch/powerpc/include/asm/setup.h @@ -3,4 +3,6 @@ #include +extern void ppc_printk_progress(char *s, unsigned short hex); + #endif /* _ASM_POWERPC_SETUP_H */ diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 79fca26..e053b16 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -704,6 +704,11 @@ static int powerpc_debugfs_init(void) arch_initcall(powerpc_debugfs_init); #endif +void ppc_printk_progress(char *s, unsigned short hex) +{ + pr_info("%s\n", s); +} + static int ppc_dflt_bus_notify(struct notifier_block *nb, unsigned long action, void *data) { diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index f4e6408..e0d2aa0 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -386,7 +386,7 @@ void free_initmem(void) { unsigned long addr; - ppc_md.progress = NULL; + ppc_md.progress = ppc_printk_progress; addr = (unsigned long)__init_begin; for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) { -- 1.7.4