Merge pull request #5689 from rhc54/topic/psm2

Ralph Castain · web-flow · commit fb67b1703f31 · 2018-09-12T16:40:23.000-07:00
Silence warning of unused function
diff --git a/opal/mca/patcher/base/patcher_base_patch.c b/opal/mca/patcher/base/patcher_base_patch.c
@@ -77,6 +77,7 @@ static int PatchLoadImm (uintptr_t addr, unsigned int reg, size_t value)
 
 #endif
 
+#if !HAVE___CLEAR_CACHE
 static void flush_and_invalidate_cache (unsigned long a)
 {
 #if OPAL_ASSEMBLY_ARCH == OPAL_IA32
@@ -114,6 +115,7 @@ static void flush_and_invalidate_cache (unsigned long a)
                       "isb":: "r" (a));
 #endif
 }
+#endif   // HAVE___CLEAR_CACHE
 
 // modify protection of memory range
 static void ModifyMemoryProtection (uintptr_t addr, size_t length, int prot)

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ static int PatchLoadImm (uintptr_t addr, unsigned int reg, size_t value)`
`77`	`77`
`78`	`78`	`#endif`
`79`	`79`
	`80`	`+#if !HAVE___CLEAR_CACHE`
`80`	`81`	`static void flush_and_invalidate_cache (unsigned long a)`
`81`	`82`	`{`
`82`	`83`	`#if OPAL_ASSEMBLY_ARCH == OPAL_IA32`
`@@ -114,6 +115,7 @@ static void flush_and_invalidate_cache (unsigned long a)`
`114`	`115`	`"isb":: "r" (a));`
`115`	`116`	`#endif`
`116`	`117`	`}`
	`118`	`+#endif // HAVE___CLEAR_CACHE`
`117`	`119`
`118`	`120`	`// modify protection of memory range`
`119`	`121`	`static void ModifyMemoryProtection (uintptr_t addr, size_t length, int prot)`