|
@@ -53,7 +53,7 @@ static union
|
|
|
uint8_t raw[RT_VDSO_DATA_PAGE_COUNT * ARCH_PAGE_SIZE];
|
|
uint8_t raw[RT_VDSO_DATA_PAGE_COUNT * ARCH_PAGE_SIZE];
|
|
|
} rt_vdso_data_page_store RT_VDSO_DATA_PAGE_ALIGNED;
|
|
} rt_vdso_data_page_store RT_VDSO_DATA_PAGE_ALIGNED;
|
|
|
struct rt_vdso_data_page *rt_vdso_kernel_data_page = &rt_vdso_data_page_store.data_page;
|
|
struct rt_vdso_data_page *rt_vdso_kernel_data_page = &rt_vdso_data_page_store.data_page;
|
|
|
-RT_DEFINE_HW_SPINLOCK(rt_vdso_data_page_lock);
|
|
|
|
|
|
|
+static struct rt_spinlock rt_vdso_data_page_lock;
|
|
|
static int rt_vdso_runtime_status = RT_EOK;
|
|
static int rt_vdso_runtime_status = RT_EOK;
|
|
|
|
|
|
|
|
static struct timespec rt_vdso_realtime_offset;
|
|
static struct timespec rt_vdso_realtime_offset;
|
|
@@ -203,7 +203,7 @@ void rt_vdso_set_realtime(const struct timespec *realtime)
|
|
|
struct timespec monotonic;
|
|
struct timespec monotonic;
|
|
|
rt_uint64_t counter;
|
|
rt_uint64_t counter;
|
|
|
rt_uint64_t freq;
|
|
rt_uint64_t freq;
|
|
|
-
|
|
|
|
|
|
|
+ rt_base_t level;
|
|
|
if (rt_vdso_runtime_status != RT_EOK || realtime == RT_NULL)
|
|
if (rt_vdso_runtime_status != RT_EOK || realtime == RT_NULL)
|
|
|
{
|
|
{
|
|
|
return;
|
|
return;
|
|
@@ -214,13 +214,13 @@ void rt_vdso_set_realtime(const struct timespec *realtime)
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- rt_hw_spin_lock(&rt_vdso_data_page_lock);
|
|
|
|
|
|
|
+ level = rt_spin_lock_irqsave(&rt_vdso_data_page_lock);
|
|
|
rt_vdso_data_page_write_begin(rt_vdso_kernel_data_page);
|
|
rt_vdso_data_page_write_begin(rt_vdso_kernel_data_page);
|
|
|
rt_vdso_realtime_offset = rt_vdso_timespec_subtract(realtime, &monotonic);
|
|
rt_vdso_realtime_offset = rt_vdso_timespec_subtract(realtime, &monotonic);
|
|
|
rt_vdso_realtime_offset_ready = RT_TRUE;
|
|
rt_vdso_realtime_offset_ready = RT_TRUE;
|
|
|
rt_vdso_store_clock_snapshot(&monotonic, counter, freq);
|
|
rt_vdso_store_clock_snapshot(&monotonic, counter, freq);
|
|
|
rt_vdso_data_page_write_end(rt_vdso_kernel_data_page);
|
|
rt_vdso_data_page_write_end(rt_vdso_kernel_data_page);
|
|
|
- rt_hw_spin_unlock(&rt_vdso_data_page_lock);
|
|
|
|
|
|
|
+ rt_spin_unlock_irqrestore(&rt_vdso_data_page_lock, level);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void *rt_vdso_map_physical_pages(struct rt_lwp *lwp, void *user_va,
|
|
static void *rt_vdso_map_physical_pages(struct rt_lwp *lwp, void *user_va,
|
|
@@ -337,11 +337,11 @@ void rt_vdso_sync_clock_data(void)
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- rt_hw_spin_lock(&rt_vdso_data_page_lock);
|
|
|
|
|
|
|
+ rt_spin_lock(&rt_vdso_data_page_lock);
|
|
|
rt_vdso_data_page_write_begin(rt_vdso_kernel_data_page);
|
|
rt_vdso_data_page_write_begin(rt_vdso_kernel_data_page);
|
|
|
rt_vdso_store_clock_snapshot(&monotonic, counter, freq);
|
|
rt_vdso_store_clock_snapshot(&monotonic, counter, freq);
|
|
|
rt_vdso_data_page_write_end(rt_vdso_kernel_data_page);
|
|
rt_vdso_data_page_write_end(rt_vdso_kernel_data_page);
|
|
|
- rt_hw_spin_unlock(&rt_vdso_data_page_lock);
|
|
|
|
|
|
|
+ rt_spin_unlock(&rt_vdso_data_page_lock);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static int rt_vdso_validate_elf_header(const void *image)
|
|
static int rt_vdso_validate_elf_header(const void *image)
|