Skip to content

Commit 0235220

Browse files
anna-marialxKAGA-KOKO
authored andcommitted
vdso/namespace: Rename timens_setup_vdso_data() to reflect new vdso_clock struct
To support multiple PTP clocks, the VDSO data structure needs to be reworked. All clock specific data will end up in struct vdso_clock and in struct vdso_time_data there will be array of VDSO clocks. At the moment, vdso_clock is simply a define which maps vdso_clock to vdso_time_data. For time namespaces, vdso_time_data needs to be set up. But only the clock related part of the vdso_data thats requires this setup. To reflect the future struct vdso_clock, rename timens_setup_vdso_data() to timns_setup_vdso_clock_data(). No functional change. Signed-off-by: Anna-Maria Behnsen <[email protected]> Signed-off-by: Nam Cao <[email protected]> Signed-off-by: Thomas Weißschuh <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent b5afbc1 commit 0235220

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

kernel/time/namespace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ static struct timens_offset offset_from_ts(struct timespec64 off)
176176
* Timens page has vdso_time_data->clock_mode set to VDSO_CLOCKMODE_TIMENS which
177177
* enforces the time namespace handling path.
178178
*/
179-
static void timens_setup_vdso_data(struct vdso_time_data *vdata,
180-
struct time_namespace *ns)
179+
static void timens_setup_vdso_clock_data(struct vdso_time_data *vdata,
180+
struct time_namespace *ns)
181181
{
182182
struct timens_offset *offset = vdata->offset;
183183
struct timens_offset monotonic = offset_from_ts(ns->offsets.monotonic);
@@ -238,7 +238,7 @@ static void timens_set_vvar_page(struct task_struct *task,
238238
vdata = page_address(ns->vvar_page);
239239

240240
for (i = 0; i < CS_BASES; i++)
241-
timens_setup_vdso_data(&vdata[i], ns);
241+
timens_setup_vdso_clock_data(&vdata[i], ns);
242242

243243
out:
244244
mutex_unlock(&offset_lock);

lib/vdso/datastore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ struct vm_area_struct *vdso_install_vvar_mapping(struct mm_struct *mm, unsigned
109109
* non-root time namespace. Whenever a task changes its namespace, the VVAR
110110
* page tables are cleared and then they will be re-faulted with a
111111
* corresponding layout.
112-
* See also the comment near timens_setup_vdso_data() for details.
112+
* See also the comment near timens_setup_vdso_clock_data() for details.
113113
*/
114114
int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
115115
{

0 commit comments

Comments
 (0)