vserver 1.9.5.x5

[linux-2.6.git] / arch / sparc64 / kernel / setup.c

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 3d097a4..0c9ce2b 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -43,10 +43,10 @@
 #include <asm/idprom.h>
 #include <asm/head.h>
 #include <asm/starfire.h>
-#include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/timer.h>
 #include <asm/sections.h>
+#include <asm/setup.h>
 
 #ifdef CONFIG_IP_PNP
 #include <net/ipconfig.h>
@@ -151,6 +151,7 @@ int prom_callback(long *args)
                        struct task_struct *p;
                        struct mm_struct *mm = NULL;
                        pgd_t *pgdp;
+                       pud_t *pudp;
                        pmd_t *pmdp;
                        pte_t *ptep;
 
@@ -166,7 +167,10 @@ int prom_callback(long *args)
                        pgdp = pgd_offset(mm, va);
                        if (pgd_none(*pgdp))
                                goto done;
-                       pmdp = pmd_offset(pgdp, va);
+                       pudp = pud_offset(pgdp, va);
+                       if (pud_none(*pudp))
+                               goto done;
+                       pmdp = pmd_offset(pudp, va);
                        if (pmd_none(*pmdp))
                                goto done;
 
@@ -208,6 +212,7 @@ int prom_callback(long *args)
                         * vmalloc or prom_inherited mapping.
                         */
                        pgd_t *pgdp;
+                       pud_t *pudp;
                        pmd_t *pmdp;
                        pte_t *ptep;
                        int error;
@@ -221,7 +226,10 @@ int prom_callback(long *args)
                        pgdp = pgd_offset_k(va);
                        if (pgd_none(*pgdp))
                                goto done;
-                       pmdp = pmd_offset(pgdp, va);
+                       pudp = pud_offset(pgdp, va);
+                       if (pud_none(*pudp))
+                               goto done;
+                       pmdp = pmd_offset(pudp, va);
                        if (pmd_none(*pmdp))
                                goto done;
 
@@ -451,8 +459,7 @@ extern unsigned short ram_flags;
 
 extern int root_mountflags;
 
-char saved_command_line[256];
-char reboot_command[256];
+char reboot_command[COMMAND_LINE_SIZE];
 
 static struct pt_regs fake_swapper_regs = { { 0, }, 0, 0, 0, 0 };