diff options
author | Nathan Fontenot <nfont@austin.ibm.com> | 2008-07-23 14:36:38 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 01:44:45 -0400 |
commit | 8391e42a5c1f3d757faa5e7f46a4a68f9aa6cb12 (patch) | |
tree | ad42416fa31c7aa115fce330cfcbc95a66470047 /arch | |
parent | 39c1ffecc6aabcc8105602a95ce769f27bcf6048 (diff) |
powerpc/pseries: Update arch vector to indicate support for CMO
Update the architecture vector to indicate that Cooperative Memory
Overcommitment is supported if CONFIG_PPC_SMLPAR is set.
Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
Signed-off-by: Robert Jennings <rcj@linux.vnet.ibm.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 1ea8c8d3ce89..c4ab2195b9cb 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -643,6 +643,11 @@ static void __init early_cmdline_parse(void) | |||
643 | #else | 643 | #else |
644 | #define OV5_MSI 0x00 | 644 | #define OV5_MSI 0x00 |
645 | #endif /* CONFIG_PCI_MSI */ | 645 | #endif /* CONFIG_PCI_MSI */ |
646 | #ifdef CONFIG_PPC_SMLPAR | ||
647 | #define OV5_CMO 0x80 /* Cooperative Memory Overcommitment */ | ||
648 | #else | ||
649 | #define OV5_CMO 0x00 | ||
650 | #endif | ||
646 | 651 | ||
647 | /* | 652 | /* |
648 | * The architecture vector has an array of PVR mask/value pairs, | 653 | * The architecture vector has an array of PVR mask/value pairs, |
@@ -687,10 +692,12 @@ static unsigned char ibm_architecture_vec[] = { | |||
687 | 0, /* don't halt */ | 692 | 0, /* don't halt */ |
688 | 693 | ||
689 | /* option vector 5: PAPR/OF options */ | 694 | /* option vector 5: PAPR/OF options */ |
690 | 3 - 2, /* length */ | 695 | 5 - 2, /* length */ |
691 | 0, /* don't ignore, don't halt */ | 696 | 0, /* don't ignore, don't halt */ |
692 | OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY | | 697 | OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY | |
693 | OV5_DONATE_DEDICATE_CPU | OV5_MSI, | 698 | OV5_DONATE_DEDICATE_CPU | OV5_MSI, |
699 | 0, | ||
700 | OV5_CMO, | ||
694 | }; | 701 | }; |
695 | 702 | ||
696 | /* Old method - ELF header with PT_NOTE sections */ | 703 | /* Old method - ELF header with PT_NOTE sections */ |