Skip to content

Commit 6c8bdb4

Browse files
committed
Revert "lparstat: print memory mode correctly"
This reverts commit b6f50dc. Further upstream discussion came to the conclusion that this approach missed some corner cases, and a different solution to follow was proposed. Signed-off-by: Tyrel Datwyler <[email protected]>
1 parent b6f50dc commit 6c8bdb4

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

src/common/cpu_info_helpers.h

-6
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,4 @@ extern int __get_one_smt_state(int core, int threads_per_cpu);
4747
extern int __do_smt(bool numeric, int cpus_in_system, int threads_per_cpu,
4848
bool print_smt_state);
4949

50-
#if defined (__powerpc__) && defined (__BUILTIN_CPU_SUPPORTS__)
51-
# define BUILTIN_CPU_SUPPORTS(X) __builtin_cpu_supports(X)
52-
#else
53-
# define BUILTIN_CPU_SUPPORTS(X) 0
54-
#endif
55-
5650
#endif /* CPU_INFO_H */

src/lparstat.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -794,11 +794,7 @@ void get_memory_mode(struct sysentry *se, char *buf)
794794
struct sysentry *tmp;
795795

796796
tmp = get_sysentry("entitled_memory_pool_number");
797-
/*
798-
* from power10 onwards Active Memory Sharing(AMS) is not
799-
* supported. Hence always display it as dedicated for those
800-
*/
801-
if (atoi(tmp->value) == 65535 || BUILTIN_CPU_SUPPORTS("arch_3_1"))
797+
if (atoi(tmp->value) == 65535)
802798
sprintf(buf, "Dedicated");
803799
else
804800
sprintf(buf, "Shared");

0 commit comments

Comments
 (0)