Commit 65f36f41 authored by Cedric Le Goater's avatar Cedric Le Goater Committed by Benjamin Herrenschmidt

powerpc/nvram: Scan partitions only once

nvram_scan_partitions() is called twice when initializing the "lnx,oops-log"
partition and the "ibm,rtas-log" partition. This fills the partition list
with duplicate entries. This patch moves the partition scan in the init
routine pseries_nvram_init_log_partitions() which is called only once.
Signed-off-by: default avatarCedric Le Goater <clg@fr.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 50bd6153
...@@ -429,9 +429,6 @@ static int __init pseries_nvram_init_os_partition(struct nvram_os_partition ...@@ -429,9 +429,6 @@ static int __init pseries_nvram_init_os_partition(struct nvram_os_partition
loff_t p; loff_t p;
int size; int size;
/* Scan nvram for partitions */
nvram_scan_partitions();
/* Look for ours */ /* Look for ours */
p = nvram_find_partition(part->name, NVRAM_SIG_OS, &size); p = nvram_find_partition(part->name, NVRAM_SIG_OS, &size);
...@@ -795,6 +792,9 @@ static int __init pseries_nvram_init_log_partitions(void) ...@@ -795,6 +792,9 @@ static int __init pseries_nvram_init_log_partitions(void)
{ {
int rc; int rc;
/* Scan nvram for partitions */
nvram_scan_partitions();
rc = pseries_nvram_init_os_partition(&rtas_log_partition); rc = pseries_nvram_init_os_partition(&rtas_log_partition);
nvram_init_oops_partition(rc == 0); nvram_init_oops_partition(rc == 0);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment