Commit 8ecd2953 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Eric W. Biederman

ipc/shm: fix up for struct file no longer being available in shm.h

Stephen Rothewell <sfr@canb.auug.org.au> wrote:

> After merging the userns tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> In file included from include/linux/sched.h:16:0,
>                  from arch/powerpc/lib/xor_vmx_glue.c:14:
> include/linux/shm.h:17:35: error: 'struct file' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>  bool is_file_shm_hugepages(struct file *file);
>                                    ^~~~
>
> and many, many more (most warnings, but some errors - arch/powerpc is
> mostly built with -Werror)

I dug through this and I discovered that the error was caused by the
removal of struct shmid_kernel from shm.h when building on powerpc.
Except for observing the existence of "struct file *shm_file" in
struct shmid_kernel I have no clue why the structure move would cause
such a failure.  I suspect shm.h always needed the forward declaration
and someting had been confusing gcc into not issuing the warning. --EWB

Fixes: a2e102cd ("shm: Move struct shmid_kernel into ipc/shm.c")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 0d79cbf8
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#include <uapi/linux/shm.h> #include <uapi/linux/shm.h>
#include <asm/shmparam.h> #include <asm/shmparam.h>
struct file;
#ifdef CONFIG_SYSVIPC #ifdef CONFIG_SYSVIPC
struct sysv_shm { struct sysv_shm {
struct list_head shm_clist; struct list_head shm_clist;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment