Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 4 insertions, 40 deletions

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index ee3b20de2e7a..d0bb68af0ea4 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -25,7 +25,7 @@
 #include <linux/seq_file.h>
 #include <linux/ioport.h>
 #include <linux/console.h>
-#include <linux/version.h>
+#include <linux/utsname.h>
 #include <linux/tty.h>
 #include <linux/root_dev.h>
 #include <linux/notifier.h>
@@ -89,7 +89,7 @@ extern void udbg_init_maple_realmode(void);
 #define EARLY_DEBUG_INIT() udbg_init_maple_realmode()
 #define EARLY_DEBUG_INIT() udbg_init_pmac_realmode()
 #define EARLY_DEBUG_INIT()                                              \
-        do { ppc_md.udbg_putc = call_rtas_display_status_delay; } while(0)
+        do { udbg_putc = call_rtas_display_status_delay; } while(0)
 #endif
 
 /* extern void *stab; */
@@ -108,7 +108,6 @@ int boot_cpuid = 0;
 int boot_cpuid_phys = 0;
 dev_t boot_dev;
 u64 ppc64_pft_size;
-u64 ppc64_debug_switch;
 
 struct ppc64_caches ppc64_caches;
 EXPORT_SYMBOL_GPL(ppc64_caches);
@@ -154,34 +153,6 @@ struct screen_info screen_info = {
         .orig_video_points = 16
 };
 
-/*
- * Initialize the PPCDBG state.  Called before relocation has been enabled.
- */
-void __init ppcdbg_initialize(void)
-{
-        ppc64_debug_switch = PPC_DEBUG_DEFAULT; /* | PPCDBG_BUSWALK | */
-        /* PPCDBG_PHBINIT | PPCDBG_MM | PPCDBG_MMINIT | PPCDBG_TCEINIT | PPCDBG_TCE */;
-}
-
-/*
- * Early boot console based on udbg
- */
-static struct console udbg_console = {
-        .name   = "udbg",
-        .write  = udbg_console_write,
-        .flags  = CON_PRINTBUFFER,
-        .index  = -1,
-};
-static int early_console_initialized;
-
-void __init disable_early_printk(void)
-{
-        if (!early_console_initialized)
-                return;
-        unregister_console(&udbg_console);
-        early_console_initialized = 0;
-}
-
 #if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_SMP)
 
 static int smt_enabled_cmdline;
@@ -425,12 +396,6 @@ void __init early_setup(unsigned long dt_ptr)
         }
         ppc_md = **mach;
 
-        /* our udbg callbacks got overriden by the above, let's put them
-         * back in. Ultimately, I want those things to be split from the
-         * main ppc_md
-         */
-        EARLY_DEBUG_INIT();
-
         DBG("Found, Initializing memory management...\n");
 
         /*
@@ -636,8 +601,7 @@ void __init setup_system(void)
         /*
          * Register early console
          */
-        early_console_initialized = 1;
-        register_console(&udbg_console);
+        register_early_udbg_console();
 
         /* Save unparsed command line copy for /proc/cmdline */
         strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
@@ -657,7 +621,7 @@ void __init setup_system(void)
         smp_release_cpus();
 #endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */
 
-        printk("Starting Linux PPC64 %s\n", UTS_RELEASE);
+        printk("Starting Linux PPC64 %s\n", system_utsname.version);
 
         printk("-----------------------------------------------------\n");
         printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);