| Message ID | 20190613070903.17214-16-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/17] binfmt_flat: remove flat_reloc_valid | expand |
Hello! On 13.06.2019 10:09, Christoph Hellwig wrote: > MAX_SHARED_LIBS is an implementation detail of the kernel loader, > and should be kept away from the file format definition. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > fs/binfmt_flat.c | 6 ++++++ > include/linux/flat.h | 6 ------ > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c > index 0ca65d51bb01..ccd9843e979e 100644 > --- a/fs/binfmt_flat.c > +++ b/fs/binfmt_flat.c > @@ -68,6 +68,12 @@ > #define RELOC_FAILED 0xff00ff01 /* Relocation incorrect somewhere */ > #define UNLOADED_LIB 0x7ff000ff /* Placeholder for unused library */ > > +#ifdef CONFIG_BINFMT_SHARED_FLAT > +#define MAX_SHARED_LIBS (4) > +#else > +#define MAX_SHARED_LIBS (1) > +#endif Perhaps the time to remove ()? [...] MBR, Sergei
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 0ca65d51bb01..ccd9843e979e 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -68,6 +68,12 @@ #define RELOC_FAILED 0xff00ff01 /* Relocation incorrect somewhere */ #define UNLOADED_LIB 0x7ff000ff /* Placeholder for unused library */ +#ifdef CONFIG_BINFMT_SHARED_FLAT +#define MAX_SHARED_LIBS (4) +#else +#define MAX_SHARED_LIBS (1) +#endif + struct lib_info { struct { unsigned long start_code; /* Start of text segment */ diff --git a/include/linux/flat.h b/include/linux/flat.h index d586bb6e64a7..83977c0ce3de 100644 --- a/include/linux/flat.h +++ b/include/linux/flat.h @@ -12,12 +12,6 @@ #define FLAT_VERSION 0x00000004L -#ifdef CONFIG_BINFMT_SHARED_FLAT -#define MAX_SHARED_LIBS (4) -#else -#define MAX_SHARED_LIBS (1) -#endif - /* * To make everything easier to port and manage cross platform * development, all fields are in network byte order.
MAX_SHARED_LIBS is an implementation detail of the kernel loader, and should be kept away from the file format definition. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/binfmt_flat.c | 6 ++++++ include/linux/flat.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)