Merge branch 'master' into dev

This commit is contained in:
XMRig 2021-07-02 00:35:52 +07:00
commit 45dd58f808
No known key found for this signature in database
GPG key ID: 446A53638BE94409
2 changed files with 5 additions and 5 deletions

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh -e
MSR_FILE=/sys/module/msr/parameters/allow_writes MSR_FILE=/sys/module/msr/parameters/allow_writes
@ -8,9 +8,9 @@ else
modprobe msr allow_writes=on modprobe msr allow_writes=on
fi fi
if cat /proc/cpuinfo | grep -E 'AMD Ryzen|AMD EPYC' > /dev/null; if grep -E 'AMD Ryzen|AMD EPYC' /proc/cpuinfo > /dev/null;
then then
if cat /proc/cpuinfo | grep "cpu family[[:space:]]:[[:space:]]25" > /dev/null; if grep "cpu family[[:space:]]:[[:space:]]25" /proc/cpuinfo > /dev/null;
then then
echo "Detected Zen3 CPU" echo "Detected Zen3 CPU"
wrmsr -a 0xc0011020 0x4480000000000 wrmsr -a 0xc0011020 0x4480000000000
@ -26,7 +26,7 @@ if cat /proc/cpuinfo | grep -E 'AMD Ryzen|AMD EPYC' > /dev/null;
wrmsr -a 0xc001102b 0x2000cc16 wrmsr -a 0xc001102b 0x2000cc16
echo "MSR register values for Zen1/Zen2 applied" echo "MSR register values for Zen1/Zen2 applied"
fi fi
elif cat /proc/cpuinfo | grep "Intel" > /dev/null; elif grep "Intel" /proc/cpuinfo > /dev/null;
then then
echo "Detected Intel CPU" echo "Detected Intel CPU"
wrmsr -a 0x1a4 0xf wrmsr -a 0x1a4 0xf

View file

@ -28,7 +28,7 @@
#define APP_ID "xmrig" #define APP_ID "xmrig"
#define APP_NAME "XMRig" #define APP_NAME "XMRig"
#define APP_DESC "XMRig miner" #define APP_DESC "XMRig miner"
#define APP_VERSION "6.13.0-dev" #define APP_VERSION "6.13.0"
#define APP_DOMAIN "xmrig.com" #define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com" #define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com"