aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2017-05-15 16:31:03 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-05-16 15:41:35 +1000
commit8af5b3c084fa51b553cb7793304c4a258a2cf420 (patch)
tree02128907b7a4fa344a7b83b9bdea921e3c4d6f1d
parent5d1abb640e0bc400257233992956d430226b0d6b (diff)
downloadskiboot-8af5b3c084fa51b553cb7793304c4a258a2cf420.zip
skiboot-8af5b3c084fa51b553cb7793304c4a258a2cf420.tar.gz
skiboot-8af5b3c084fa51b553cb7793304c4a258a2cf420.tar.bz2
hdata: Respect OCC and HOMER resevations
In the past we've ignored these since Hostboot insisted in exporting broken reservations and the OCC was not being used yet. This situation seems to have resolved itself so we should respect the reservations that hostboot provides. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Acked-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> Tested-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> Tested-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--hdata/memory.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/hdata/memory.c b/hdata/memory.c
index 2df1136..0c6c081 100644
--- a/hdata/memory.c
+++ b/hdata/memory.c
@@ -457,12 +457,6 @@ static void get_hb_reserved_mem(struct HDIF_common_hdr *ms_vpd)
if (label_size > 64)
label_size = 64;
- /* these are broken, just ignore them */
- if (!strncmp(hb_resv_mem->label, "ibm,homer-image", label_size))
- continue;
- if (!strncmp(hb_resv_mem->label, "ibm,occ-common-area", label_size))
- continue;
-
label = malloc(label_size+1);
assert(label);