From: Carsten Haitzler carsten.haitzler@foss.arm.com
Block device ioctl's now take a user_uintptr_t as last argument for morello, so adapt to this to keep compiling if CONFIG_CHECKPOINT_RESTORE is enabled.
Signed-off-by: Carsten Haitzler carsten.haitzler@foss.arm.com --- fs/timerfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/timerfd.c b/fs/timerfd.c index e9c96a0c79f1..5a362ef4eed1 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -347,7 +347,7 @@ static void timerfd_show(struct seq_file *m, struct file *file) #endif
#ifdef CONFIG_CHECKPOINT_RESTORE -static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long timerfd_ioctl(struct file *file, unsigned int cmd, user_uintptr_t arg) { struct timerfd_ctx *ctx = file->private_data; int ret = 0;
In title: s/arg to/arg of/
On 19/10/2022 19:02, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@foss.arm.com
Block device ioctl's now take a user_uintptr_t as last argument for morello, so adapt to this to keep compiling if CONFIG_CHECKPOINT_RESTORE
Let's just leave out "for morello", it's a change motivated by PCuABI but the type change is unconditional (ioctl handlers take user_uintptr_t regardless).
Kevin
is enabled.
Signed-off-by: Carsten Haitzler carsten.haitzler@foss.arm.com
fs/timerfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/timerfd.c b/fs/timerfd.c index e9c96a0c79f1..5a362ef4eed1 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -347,7 +347,7 @@ static void timerfd_show(struct seq_file *m, struct file *file) #endif #ifdef CONFIG_CHECKPOINT_RESTORE -static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long timerfd_ioctl(struct file *file, unsigned int cmd, user_uintptr_t arg) { struct timerfd_ctx *ctx = file->private_data; int ret = 0;
sent updated patch.
On 10/25/22 10:30, Kevin Brodsky wrote:
In title: s/arg to/arg of/
On 19/10/2022 19:02, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@foss.arm.com
Block device ioctl's now take a user_uintptr_t as last argument for morello, so adapt to this to keep compiling if CONFIG_CHECKPOINT_RESTORE
Let's just leave out "for morello", it's a change motivated by PCuABI but the type change is unconditional (ioctl handlers take user_uintptr_t regardless).
Kevin
is enabled.
Signed-off-by: Carsten Haitzler carsten.haitzler@foss.arm.com
fs/timerfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/timerfd.c b/fs/timerfd.c index e9c96a0c79f1..5a362ef4eed1 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -347,7 +347,7 @@ static void timerfd_show(struct seq_file *m, struct file *file) #endif #ifdef CONFIG_CHECKPOINT_RESTORE -static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long timerfd_ioctl(struct file *file, unsigned int cmd, user_uintptr_t arg) { struct timerfd_ctx *ctx = file->private_data; int ret = 0;
linux-morello@op-lists.linaro.org
-
Carsten Haitzler -
carsten.haitzler＠foss.arm.com
-
Kevin Brodsky