timekeeping: Use proper clock specifier names in functions (9285ec4c) · Commits · 戴 / test

Documentation/core-api/timekeeping.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ different format depending on what is required by the user:
		.. c:function:: u64 ktime_get_ns( void )
		u64 ktime_get_boottime_ns( void )
		u64 ktime_get_real_ns( void )
		u64 ktime_get_tai_ns( void )
		u64 ktime_get_clocktai_ns( void )
		u64 ktime_get_raw_ns( void )

		Same as the plain ktime_get functions, but returning a u64 number

arch/x86/kvm/pmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -264,10 +264,10 @@ static int kvm_pmu_rdpmc_vmware(struct kvm_vcpu vcpu, unsigned idx, u64 data)
		ctr_val = rdtsc();
		break;
		case VMWARE_BACKDOOR_PMC_REAL_TIME:
		ctr_val = ktime_get_boot_ns();
		ctr_val = ktime_get_boottime_ns();
		break;
		case VMWARE_BACKDOOR_PMC_APPARENT_TIME:
		ctr_val = ktime_get_boot_ns() +
		ctr_val = ktime_get_boottime_ns() +
		vcpu->kvm->arch.kvmclock_offset;
		break;
		default:

arch/x86/kvm/x86.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1731,7 +1731,7 @@ void kvm_write_tsc(struct kvm_vcpu vcpu, struct msr_data msr)

		raw_spin_lock_irqsave(&kvm->arch.tsc_write_lock, flags);
		offset = kvm_compute_tsc_offset(vcpu, data);
		ns = ktime_get_boot_ns();
		ns = ktime_get_boottime_ns();
		elapsed = ns - kvm->arch.last_tsc_nsec;

		if (vcpu->arch.virtual_tsc_khz) {
		@@ -2073,7 +2073,7 @@ u64 get_kvmclock_ns(struct kvm *kvm)
		spin_lock(&ka->pvclock_gtod_sync_lock);
		if (!ka->use_master_clock) {
		spin_unlock(&ka->pvclock_gtod_sync_lock);
		return ktime_get_boot_ns() + ka->kvmclock_offset;
		return ktime_get_boottime_ns() + ka->kvmclock_offset;
		}

		hv_clock.tsc_timestamp = ka->master_cycle_now;
		@@ -2089,7 +2089,7 @@ u64 get_kvmclock_ns(struct kvm *kvm)
		&hv_clock.tsc_to_system_mul);
		ret = __pvclock_read_cycles(&hv_clock, rdtsc());
		} else
		ret = ktime_get_boot_ns() + ka->kvmclock_offset;
		ret = ktime_get_boottime_ns() + ka->kvmclock_offset;

		put_cpu();

		@@ -2188,7 +2188,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
		}
		if (!use_master_clock) {
		host_tsc = rdtsc();
		kernel_ns = ktime_get_boot_ns();
		kernel_ns = ktime_get_boottime_ns();
		}

		tsc_timestamp = kvm_read_l1_tsc(v, host_tsc);
		@@ -9018,7 +9018,7 @@ int kvm_arch_hardware_enable(void)
		* before any KVM threads can be running. Unfortunately, we can't
		* bring the TSCs fully up to date with real time, as we aren't yet far
		* enough into CPU bringup that we know how much real time has actually
		* elapsed; our helper function, ktime_get_boot_ns() will be using boot
		* elapsed; our helper function, ktime_get_boottime_ns() will be using boot
		* variables that haven't been updated yet.
		*
		* So we simply find the maximum observed TSC above, then record the
		@@ -9246,7 +9246,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
		mutex_init(&kvm->arch.apic_map_lock);
		spin_lock_init(&kvm->arch.pvclock_gtod_sync_lock);

		kvm->arch.kvmclock_offset = -ktime_get_boot_ns();
		kvm->arch.kvmclock_offset = -ktime_get_boottime_ns();
		pvclock_update_vm_gtod_copy(kvm);

		kvm->arch.guest_can_read_msr_platform_info = true;

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -837,7 +837,7 @@ static int kfd_ioctl_get_clock_counters(struct file *filep,

		/* No access to rdtsc. Using raw monotonic time */
		args->cpu_clock_counter = ktime_get_raw_ns();
		args->system_clock_counter = ktime_get_boot_ns();
		args->system_clock_counter = ktime_get_boottime_ns();

		/* Since the counter is in nano-seconds we use 1GHz frequency */
		args->system_clock_freq = 1000000000;

drivers/iio/humidity/dht11.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ static int dht11_decode(struct dht11 *dht11, int offset)
		return -EIO;
		}

		dht11->timestamp = ktime_get_boot_ns();
		dht11->timestamp = ktime_get_boottime_ns();
		if (hum_int < 4) { /* DHT22: 100000 = (3256+232)100 */
		dht11->temperature = (((temp_int & 0x7f) << 8) + temp_dec) *
		((temp_int & 0x80) ? -100 : 100);
		@@ -177,7 +177,7 @@ static irqreturn_t dht11_handle_irq(int irq, void *data)

		/* TODO: Consider making the handler safe for IRQ sharing */
		if (dht11->num_edges < DHT11_EDGES_PER_READ && dht11->num_edges >= 0) {
		dht11->edges[dht11->num_edges].ts = ktime_get_boot_ns();
		dht11->edges[dht11->num_edges].ts = ktime_get_boottime_ns();
		dht11->edges[dht11->num_edges++].value =
		gpio_get_value(dht11->gpio);

		@@ -196,7 +196,7 @@ static int dht11_read_raw(struct iio_dev *iio_dev,
		int ret, timeres, offset;

		mutex_lock(&dht11->lock);
		if (dht11->timestamp + DHT11_DATA_VALID_TIME < ktime_get_boot_ns()) {
		if (dht11->timestamp + DHT11_DATA_VALID_TIME < ktime_get_boottime_ns()) {
		timeres = ktime_get_resolution_ns();
		dev_dbg(dht11->dev, "current timeresolution: %dns\n", timeres);
		if (timeres > DHT11_MIN_TIMERES) {
		@@ -322,7 +322,7 @@ static int dht11_probe(struct platform_device *pdev)
		return -EINVAL;
		}

		dht11->timestamp = ktime_get_boot_ns() - DHT11_DATA_VALID_TIME - 1;
		dht11->timestamp = ktime_get_boottime_ns() - DHT11_DATA_VALID_TIME - 1;
		dht11->num_edges = -1;

		platform_set_drvdata(pdev, iio);

Admin message