Commit 65f36f41 authored Oct 30, 2013 by Cedric Le Goater Committed by Benjamin Herrenschmidt Oct 31, 2013

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: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 50bd6153

arch/powerpc/platforms/pseries/nvram.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -429,9 +429,6 @@ static int __init pseries_nvram_init_os_partition(struct nvram_os_partition
		loff_t p;
		int size;

		/* Scan nvram for partitions */
		nvram_scan_partitions();

		/* Look for ours */
		p = nvram_find_partition(part->name, NVRAM_SIG_OS, &size);

		@@ -795,6 +792,9 @@ static int __init pseries_nvram_init_log_partitions(void)
		{
		int rc;

		/* Scan nvram for partitions */
		nvram_scan_partitions();

		rc = pseries_nvram_init_os_partition(&rtas_log_partition);
		nvram_init_oops_partition(rc == 0);
		return 0;