mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/powerpc/kernel/nvram_64.c
..
..
@@ -73,8 +73,7 @@
73
73
 };
74
74
 
75
75
 static void oops_to_nvram(struct kmsg_dumper *dumper,
76
-			  enum kmsg_dump_reason reason,
77
-			  struct kmsg_dumper_iter *iter);
76
+			  enum kmsg_dump_reason reason);
78
77
 
79
78
 static struct kmsg_dumper nvram_kmsg_dumper = {
80
79
 	.dump = oops_to_nvram
..
..
@@ -644,8 +643,7 @@
644
643
  * partition.  If that's too much, go back and capture uncompressed text.
645
644
  */
646
645
 static void oops_to_nvram(struct kmsg_dumper *dumper,
647
-			  enum kmsg_dump_reason reason,
648
-			  struct kmsg_dumper_iter *iter)
646
+			  enum kmsg_dump_reason reason)
649
647
 {
650
648
 	struct oops_log_info *oops_hdr = (struct oops_log_info *)oops_buf;
651
649
 	static unsigned int oops_count = 0;
..
..
@@ -683,13 +681,13 @@
683
681
 		return;
684
682
 
685
683
 	if (big_oops_buf) {
686
-		kmsg_dump_get_buffer(iter, false,
684
+		kmsg_dump_get_buffer(dumper, false,
687
685
 				     big_oops_buf, big_oops_buf_sz, &text_len);
688
686
 		rc = zip_oops(text_len);
689
687
 	}
690
688
 	if (rc != 0) {
691
-		kmsg_dump_rewind(iter);
692
-		kmsg_dump_get_buffer(iter, false,
689
+		kmsg_dump_rewind(dumper);
690
+		kmsg_dump_get_buffer(dumper, false,
693
691
 				     oops_data, oops_data_sz, &text_len);
694
692
 		err_type = ERR_TYPE_KERNEL_PANIC;
695
693
 		oops_hdr->version = cpu_to_be16(OOPS_HDR_VERSION);