6 files changed, 62 insertions, 5 deletions

diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c
index da711e37fc97..6a61deed4a85 100644
--- a/arch/alpha/kernel/console.c
+++ b/arch/alpha/kernel/console.c
@@ -61,7 +61,9 @@ locate_and_init_vga(void *(*sel_func)(void *, void *))
 
         /* Set the VGA hose and init the new console. */
         pci_vga_hose = hose;
-        take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
+        console_lock();
+        do_take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
+        console_unlock();
 }
 
 void __init
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index ab80a80d38a2..f2360a74e5d5 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -117,7 +117,9 @@ common_shutdown_1(void *generic_ptr)
                 if (in_interrupt())
                         irq_exit();
                 /* This has the effect of resetting the VGA video origin.  */
-                take_over_console(&dummy_con, 0, MAX_NR_CONSOLES-1, 1);
+                console_lock();
+                do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES-1, 1);
+                console_unlock();
 #endif
                 pci_restore_srm_config();
                 set_hae(srm_hae);
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index e2e69e1e9fe1..44dd5aa2e36f 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -257,7 +257,9 @@ static int __init bcm1480_pcibios_init(void)
         register_pci_controller(&bcm1480_controller);
 
 #ifdef CONFIG_VGA_CONSOLE
-        take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
+        console_lock();
+        do_take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
+        console_unlock();
 #endif
         return 0;
 }
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c
index cdefcc4cb8d4..fc634aeda4a5 100644
--- a/arch/mips/pci/pci-sb1250.c
+++ b/arch/mips/pci/pci-sb1250.c
@@ -283,7 +283,9 @@ static int __init sb1250_pcibios_init(void)
         register_pci_controller(&sb1250_controller);
 
 #ifdef CONFIG_VGA_CONSOLE
-        take_over_console(&vga_con, 0, MAX_NR_CONSOLES - 1, 1);
+        console_lock();
+        do_take_over_console(&vga_con, 0, MAX_NR_CONSOLES - 1, 1);
+        console_unlock();
 #endif
         return 0;
 }
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 1e95b2000ce8..7349a3fedfc7 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -156,7 +156,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 #if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
-        conswitchp = &dummy_con;        /* we use take_over_console() later ! */
+        conswitchp = &dummy_con;        /* we use do_take_over_console() later ! */
 #endif
 
 }
diff --git a/arch/powerpc/include/asm/mpc52xx_psc.h b/arch/powerpc/include/asm/mpc52xx_psc.h
index 2966df604221..d0ece257d310 100644
--- a/arch/powerpc/include/asm/mpc52xx_psc.h
+++ b/arch/powerpc/include/asm/mpc52xx_psc.h
@@ -299,4 +299,53 @@ struct mpc512x_psc_fifo {
 #define rxdata_32 rxdata.rxdata_32
 };
 
+struct mpc5125_psc {
+        u8              mr1;                    /* PSC + 0x00 */
+        u8              reserved0[3];
+        u8              mr2;                    /* PSC + 0x04 */
+        u8              reserved1[3];
+        struct {
+                u16             status;         /* PSC + 0x08 */
+                u8              reserved2[2];
+                u8              clock_select;   /* PSC + 0x0c */
+                u8              reserved3[3];
+        } sr_csr;
+        u8              command;                /* PSC + 0x10 */
+        u8              reserved4[3];
+        union {                                 /* PSC + 0x14 */
+                u8              buffer_8;
+                u16             buffer_16;
+                u32             buffer_32;
+        } buffer;
+        struct {
+                u8              ipcr;           /* PSC + 0x18 */
+                u8              reserved5[3];
+                u8              acr;            /* PSC + 0x1c */
+                u8              reserved6[3];
+        } ipcr_acr;
+        struct {
+                u16             isr;            /* PSC + 0x20 */
+                u8              reserved7[2];
+                u16             imr;            /* PSC + 0x24 */
+                u8              reserved8[2];
+        } isr_imr;
+        u8              ctur;                   /* PSC + 0x28 */
+        u8              reserved9[3];
+        u8              ctlr;                   /* PSC + 0x2c */
+        u8              reserved10[3];
+        u32             ccr;                    /* PSC + 0x30 */
+        u32             ac97slots;              /* PSC + 0x34 */
+        u32             ac97cmd;                /* PSC + 0x38 */
+        u32             ac97data;               /* PSC + 0x3c */
+        u8              reserved11[4];
+        u8              ip;                     /* PSC + 0x44 */
+        u8              reserved12[3];
+        u8              op1;                    /* PSC + 0x48 */
+        u8              reserved13[3];
+        u8              op0;                    /* PSC + 0x4c */
+        u8              reserved14[3];
+        u32             sicr;                   /* PSC + 0x50 */
+        u8              reserved15[4];  /* make eq. sizeof(mpc52xx_psc) */
+};
+
 #endif  /* __ASM_MPC52xx_PSC_H__ */