change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/sparc/kernel/setup_64.c
..
..
@@ -32,13 +32,13 @@
32
32
 #include <linux/initrd.h>
33
33
 #include <linux/module.h>
34
34
 #include <linux/start_kernel.h>
35
-#include <linux/bootmem.h>
35
+#include <linux/memblock.h>
36
+#include <uapi/linux/mount.h>
36
37
 
37
38
 #include <asm/io.h>
38
39
 #include <asm/processor.h>
39
40
 #include <asm/oplib.h>
40
41
 #include <asm/page.h>
41
-#include <asm/pgtable.h>
42
42
 #include <asm/idprom.h>
43
43
 #include <asm/head.h>
44
44
 #include <asm/starfire.h>
..
..
@@ -621,12 +621,16 @@
621
621
 	for_each_possible_cpu(i) {
622
622
 		node = cpu_to_node(i);
623
623
 
624
-		softirq_stack[i] = __alloc_bootmem_node(NODE_DATA(node),
625
-							THREAD_SIZE,
626
-							THREAD_SIZE, 0);
627
-		hardirq_stack[i] = __alloc_bootmem_node(NODE_DATA(node),
628
-							THREAD_SIZE,
629
-							THREAD_SIZE, 0);
624
+		softirq_stack[i] = memblock_alloc_node(THREAD_SIZE,
625
+						       THREAD_SIZE, node);
626
+		if (!softirq_stack[i])
627
+			panic("%s: Failed to allocate %lu bytes align=%lx nid=%d\n",
628
+			      __func__, THREAD_SIZE, THREAD_SIZE, node);
629
+		hardirq_stack[i] = memblock_alloc_node(THREAD_SIZE,
630
+						       THREAD_SIZE, node);
631
+		if (!hardirq_stack[i])
632
+			panic("%s: Failed to allocate %lu bytes align=%lx nid=%d\n",
633
+			      __func__, THREAD_SIZE, THREAD_SIZE, node);
630
634
 	}
631
635
 }
632
636
 
..
..
@@ -644,13 +648,9 @@
644
648
 		register_console(&prom_early_console);
645
649
 
646
650
 	if (tlb_type == hypervisor)
647
-		printk("ARCH: SUN4V\n");
651
+		pr_info("ARCH: SUN4V\n");
648
652
 	else
649
-		printk("ARCH: SUN4U\n");
650
-
651
-#ifdef CONFIG_DUMMY_CONSOLE
652
-	conswitchp = &dummy_con;
653
-#endif
653
+		pr_info("ARCH: SUN4U\n");
654
654
 
655
655
 	idprom_init();
656
656
 
..
..
@@ -659,8 +659,6 @@
659
659
 	ROOT_DEV = old_decode_dev(root_dev);
660
660
 #ifdef CONFIG_BLK_DEV_RAM
661
661
 	rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
662
-	rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
663
-	rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);
664
662
 #endif
665
663
 
666
664
 	task_thread_info(&init_task)->kregs = &fake_swapper_regs;