Commit ef26a46f authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

[POWERPC] iSeries: set FW_FEATURE_ISERIES earlier



This will help in the combined kernel as some really early things depend
on being able to check this.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent e6e5fee1
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -655,9 +655,6 @@ static int __init iseries_probe(void)
	if (!of_flat_dt_is_compatible(root, "IBM,iSeries"))
		return 0;

	powerpc_firmware_features |= FW_FEATURE_ISERIES;
	powerpc_firmware_features |= FW_FEATURE_LPAR;

	hpte_init_iSeries();

	return 1;
@@ -687,6 +684,9 @@ void * __init iSeries_early_setup(void)
{
	unsigned long phys_mem_size;

	powerpc_firmware_features |= FW_FEATURE_ISERIES;
	powerpc_firmware_features |= FW_FEATURE_LPAR;

	iSeries_fixup_klimit();

	/*