diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-09-24 23:27:17 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-09-24 23:27:17 -0400 |
commit | ef26a46f8c501f6888cc78bcc4a2dc1efea1e733 (patch) | |
tree | ffd373d9b241d1e1bfab67d185b807219fdcd64d /arch | |
parent | e6e5fee1426bef07f4e6c3c76f48343c14207938 (diff) |
[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: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 7f1953066ff8..7cb6b5f7c593 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -655,9 +655,6 @@ static int __init iseries_probe(void) | |||
655 | if (!of_flat_dt_is_compatible(root, "IBM,iSeries")) | 655 | if (!of_flat_dt_is_compatible(root, "IBM,iSeries")) |
656 | return 0; | 656 | return 0; |
657 | 657 | ||
658 | powerpc_firmware_features |= FW_FEATURE_ISERIES; | ||
659 | powerpc_firmware_features |= FW_FEATURE_LPAR; | ||
660 | |||
661 | hpte_init_iSeries(); | 658 | hpte_init_iSeries(); |
662 | 659 | ||
663 | return 1; | 660 | return 1; |
@@ -687,6 +684,9 @@ void * __init iSeries_early_setup(void) | |||
687 | { | 684 | { |
688 | unsigned long phys_mem_size; | 685 | unsigned long phys_mem_size; |
689 | 686 | ||
687 | powerpc_firmware_features |= FW_FEATURE_ISERIES; | ||
688 | powerpc_firmware_features |= FW_FEATURE_LPAR; | ||
689 | |||
690 | iSeries_fixup_klimit(); | 690 | iSeries_fixup_klimit(); |
691 | 691 | ||
692 | /* | 692 | /* |