mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/s390/char/sclp_cmd.c
..
..
@@ -406,7 +406,7 @@
406
406
 	if (!size)
407
407
 		goto skip_add;
408
408
 	for (addr = start; addr < start + size; addr += block_size)
409
-		add_memory(numa_pfn_to_nid(PFN_DOWN(addr)), addr, block_size);
409
+		add_memory(0, addr, block_size, MHP_NONE);
410
410
 skip_add:
411
411
 	first_rn = rn;
412
412
 	num = 1;
..
..
@@ -460,15 +460,6 @@
460
460
 	return -EPERM;
461
461
 }
462
462
 
463
-struct read_storage_sccb {
464
-	struct sccb_header header;
465
-	u16 max_id;
466
-	u16 assigned;
467
-	u16 standby;
468
-	u16 :16;
469
-	u32 entries[0];
470
-} __packed;
471
-
472
463
 static const struct dev_pm_ops sclp_mem_pm_ops = {
473
464
 	.freeze		= sclp_mem_freeze,
474
465
 };
..
..
@@ -498,7 +489,7 @@
498
489
 	for (id = 0; id <= sclp_max_storage_id; id++) {
499
490
 		memset(sccb, 0, PAGE_SIZE);
500
491
 		sccb->header.length = PAGE_SIZE;
501
-		rc = sclp_sync_request(0x00040001 | id << 8, sccb);
492
+		rc = sclp_sync_request(SCLP_CMDW_READ_STORAGE_INFO | id << 8, sccb);
502
493
 		if (rc)
503
494
 			goto out;
504
495
 		switch (sccb->header.response_code) {