Subject: [PATCH 16/16 v4] powerpc: Update arch vector to indicate support for CMO

From: Robert Jennings <[email-masked]>
Date: Wed, 23 Jul 2008 13:36:38 -0500

From: Nathan Fontenot <[email-masked]>

Update the architecture vector to indicate that Cooperative Memory
Overcommitment is supported if CONFIG_PPC_SMLPAR is set.

Signed-off-by: Nathan Fontenot <[email-masked]>
Signed-off-by: Robert Jennings <[email-masked]>

---
This is the last patch in the series.  Committing it will signal to 
the platform firmware is CMO enabled.

Made this dependent on CONFIG_PPC_SMLPAR so that we don't advertise
functionality when the kernel isn't supporting it.
---
 arch/powerpc/kernel/prom_init.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: b/arch/powerpc/kernel/prom_init.c
===================================================================
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -643,6 +643,11 @@ static void __init early_cmdline_parse(v
 #else
 #define OV5_MSI			0x00
 #endif /* CONFIG_PCI_MSI */
+#ifdef CONFIG_PPC_SMLPAR
+#define OV5_CMO			0x80	/* Cooperative Memory Overcommitment */
+#else
+#define OV5_CMO			0x00
+#endif
 
 /*
  * The architecture vector has an array of PVR mask/value pairs,
@@ -687,10 +692,12 @@ static unsigned char ibm_architecture_ve
 	0,				/* don't halt */
 
 	/* option vector 5: PAPR/OF options */
-	3 - 2,				/* length */
+	5 - 2,				/* length */
 	0,				/* don't ignore, don't halt */
 	OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY |
 	OV5_DONATE_DEDICATE_CPU | OV5_MSI,
+	0,
+	OV5_CMO,
 };
 
 /* Old method - ELF header with PT_NOTE sections */