diff options
| author | 2019-07-07 12:08:29 -0700 | |
|---|---|---|
| committer | 2019-07-07 12:08:29 -0700 | |
| commit | b901cd584e7c63ace5feb095279e1671fc605129 (patch) | |
| tree | e0809a3b6356e9dcee4295b809deb7e59b051bc6 /src | |
| parent | address review commentary (diff) | |
| download | yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar.gz yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar.xz yuzu-b901cd584e7c63ace5feb095279e1671fc605129.zip | |
clang-format fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index b0690be34..db3ab14ce 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -134,7 +134,8 @@ u64 Process::GetTotalPhysicalMemoryAvailableWithoutSystemResource() const { | |||
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | u64 Process::GetTotalPhysicalMemoryUsed() const { | 136 | u64 Process::GetTotalPhysicalMemoryUsed() const { |
| 137 | return vm_manager.GetCurrentHeapSize() + main_thread_stack_size + code_memory_size + GetSystemResourceUsage(); | 137 | return vm_manager.GetCurrentHeapSize() + main_thread_stack_size + code_memory_size + |
| 138 | GetSystemResourceUsage(); | ||
| 138 | } | 139 | } |
| 139 | 140 | ||
| 140 | u64 Process::GetTotalPhysicalMemoryUsedWithoutSystemResource() const { | 141 | u64 Process::GetTotalPhysicalMemoryUsedWithoutSystemResource() const { |
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 85e4512f0..f9fe7dce0 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -827,8 +827,7 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha | |||
| 827 | return RESULT_SUCCESS; | 827 | return RESULT_SUCCESS; |
| 828 | 828 | ||
| 829 | case GetInfoType::SystemResourceUsage: | 829 | case GetInfoType::SystemResourceUsage: |
| 830 | LOG_WARNING(Kernel_SVC, | 830 | LOG_WARNING(Kernel_SVC, "(STUBBED) Attempted to query system resource usage"); |
| 831 | "(STUBBED) Attempted to query system resource usage"); | ||
| 832 | *result = process->GetSystemResourceUsage(); | 831 | *result = process->GetSystemResourceUsage(); |
| 833 | return RESULT_SUCCESS; | 832 | return RESULT_SUCCESS; |
| 834 | 833 | ||