[PATCH] uapi elf: delete unused macros

delete unused macros and unify the comment format

From e21328f3450e841abf8a312865910806d0858373 Mon Sep 17 00:00:00 2001

From: mudongliang <redacted>
Date: Thu, 5 Nov 2015 22:46:19 +0800
Subject: [PATCH] unify the comment form and delete unused macros

Signed-off-by: mudongliang <redacted>
---
 arch/powerpc/boot/elf.h  | 6 ++----
 include/uapi/linux/elf.h | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/boot/elf.h b/arch/powerpc/boot/elf.h
index 1941bc5..e6e00ed 100644
--- a/arch/powerpc/boot/elf.h
+++ b/arch/powerpc/boot/elf.h

@@ -133,15 +133,13 @@ typedef struct elf64_phdr {
 #define	ELFCLASSNONE	0	/* EI_CLASS */
 #define	ELFCLASS32	1
 #define	ELFCLASS64	2
-#define	ELFCLASSNUM	3
 
-#define ELFDATANONE	0	/* e_ident[EI_DATA] */
+#define ELFDATANONE	0	/* EI_DATA */
 #define ELFDATA2LSB	1
 #define ELFDATA2MSB	2
 
-#define EV_NONE		0	/* e_version, EI_VERSION */
+#define EV_NONE		0	/* EI_VERSION */
 #define EV_CURRENT	1
-#define EV_NUM		2
 
 #define ELFOSABI_NONE	0
 #define ELFOSABI_LINUX	3

diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index 71e1d0e..bd049b2 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h

@@ -342,15 +342,12 @@ typedef struct elf64_shdr {
 #define	ELFCLASSNONE	0		/* EI_CLASS */
 #define	ELFCLASS32	1
 #define	ELFCLASS64	2
-#define	ELFCLASSNUM	3
 
-#define ELFDATANONE	0		/* e_ident[EI_DATA] */
+#define ELFDATANONE	0		/* EI_DATA */
 #define ELFDATA2LSB	1
-#define ELFDATA2MSB	2
 
-#define EV_NONE		0		/* e_version, EI_VERSION */
+#define EV_NONE		0		/* EI_VERSION */
 #define EV_CURRENT	1
-#define EV_NUM		2
 
 #define ELFOSABI_NONE	0
 #define ELFOSABI_LINUX	3

-- 
2.1.4

-- 
My best regards to you.

     No System Is Safe!
     mudongliang

Hi mudongliang,

[auto build test ERROR on: powerpc/next]
[also build test ERROR on: v4.3 next-20151105]

url:    https://github.com/0day-ci/linux/commits/mudongliang/uapi-elf-delete-unused-macros/20151105-234433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: m68k-sun3_defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=m68k 

All error/warnings (new ones prefixed by >>):

   In file included from include/linux/elf.h:4:0,
                    from include/linux/module.h:15,
                    from fs/binfmt_elf.c:12:
   fs/binfmt_elf.c: In function 'fill_elf_header':

quoted

arch/m68k/include/asm/elf.h:54:18: error: 'ELFDATA2MSB' undeclared (first use in this function)

    #define ELF_DATA ELFDATA2MSB
                     ^

quoted

fs/binfmt_elf.c:1350:26: note: in expansion of macro 'ELF_DATA'

     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^
   arch/m68k/include/asm/elf.h:54:18: note: each undeclared identifier is reported only once for each function it appears in
    #define ELF_DATA ELFDATA2MSB
                     ^

quoted

fs/binfmt_elf.c:1350:26: note: in expansion of macro 'ELF_DATA'

     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^
--
   In file included from include/linux/elf.h:4:0,
                    from fs/proc/kcore.c:17:
   fs/proc/kcore.c: In function 'elf_kcore_store_hdr':

quoted

arch/m68k/include/asm/elf.h:54:18: error: 'ELFDATA2MSB' undeclared (first use in this function)

    #define ELF_DATA ELFDATA2MSB
                     ^

quoted

fs/proc/kcore.c:335:26: note: in expansion of macro 'ELF_DATA'

     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^
   arch/m68k/include/asm/elf.h:54:18: note: each undeclared identifier is reported only once for each function it appears in
    #define ELF_DATA ELFDATA2MSB
                     ^

quoted

fs/proc/kcore.c:335:26: note: in expansion of macro 'ELF_DATA'

     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^
--
   In file included from include/linux/elf.h:4:0,
                    from fs//proc/kcore.c:17:
   fs//proc/kcore.c: In function 'elf_kcore_store_hdr':

quoted

arch/m68k/include/asm/elf.h:54:18: error: 'ELFDATA2MSB' undeclared (first use in this function)

    #define ELF_DATA ELFDATA2MSB
                     ^
   fs//proc/kcore.c:335:26: note: in expansion of macro 'ELF_DATA'
     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^
   arch/m68k/include/asm/elf.h:54:18: note: each undeclared identifier is reported only once for each function it appears in
    #define ELF_DATA ELFDATA2MSB
                     ^
   fs//proc/kcore.c:335:26: note: in expansion of macro 'ELF_DATA'
     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^

vim +/ELFDATA2MSB +54 arch/m68k/include/asm/elf.h

f358cbcd Greg Ungerer 2009-01-29  48  #define elf_check_arch(x) ((x)->e_machine == EM_68K)
f358cbcd Greg Ungerer 2009-01-29  49  
f358cbcd Greg Ungerer 2009-01-29  50  /*
f358cbcd Greg Ungerer 2009-01-29  51   * These are used to set parameters in the core dumps.
f358cbcd Greg Ungerer 2009-01-29  52   */
f358cbcd Greg Ungerer 2009-01-29  53  #define ELF_CLASS	ELFCLASS32
f358cbcd Greg Ungerer 2009-01-29 @54  #define ELF_DATA	ELFDATA2MSB
f358cbcd Greg Ungerer 2009-01-29  55  #define ELF_ARCH	EM_68K
f358cbcd Greg Ungerer 2009-01-29  56  
f358cbcd Greg Ungerer 2009-01-29  57  /* For SVR4/m68k the function pointer to be registered with `atexit' is

:::::: The code at line 54 was first introduced by commit
:::::: f358cbcd49027d3a58c1f29dbf02a8369bfedcf7 m68k: use mmu version of elf.h for non-mmu builds as well

:::::: TO: Greg Ungerer [off-list ref]
:::::: CC: Greg Ungerer [off-list ref]

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Hi mudongliang,

[auto build test ERROR on: powerpc/next]
[also build test ERROR on: v4.3 next-20151105]

url:    https://github.com/0day-ci/linux/commits/mudongliang/uapi-elf-delete-unused-macros/20151105-234433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: mips-jz4740 (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=mips 

All errors (new ones prefixed by >>):

   In file included from include/linux/elf.h:4:0,
                    from include/linux/module.h:15,
                    from fs/binfmt_elf.c:12:
   fs/binfmt_elf.c: In function 'fill_elf_header':

quoted

arch/mips/include/asm/elf.h:279:18: error: 'ELFDATA2MSB' undeclared (first use in this function)

    #define ELF_DATA ELFDATA2MSB
                     ^
   fs/binfmt_elf.c:1350:26: note: in expansion of macro 'ELF_DATA'
     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^
   arch/mips/include/asm/elf.h:279:18: note: each undeclared identifier is reported only once for each function it appears in
    #define ELF_DATA ELFDATA2MSB
                     ^
   fs/binfmt_elf.c:1350:26: note: in expansion of macro 'ELF_DATA'
     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^

vim +/ELFDATA2MSB +279 arch/mips/include/asm/elf.h

875d43e7 include/asm-mips/elf.h      Ralf Baechle   2005-09-03  273  #endif /* CONFIG_64BIT */
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16  274  
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16  275  /*
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16  276   * These are used to set parameters in the core dumps.
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16  277   */
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16  278  #ifdef __MIPSEB__
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16 @279  #define ELF_DATA	ELFDATA2MSB
08d9d1c4 arch/mips/include/asm/elf.h David Daney    2008-12-17  280  #elif defined(__MIPSEL__)
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16  281  #define ELF_DATA	ELFDATA2LSB
^1da177e include/asm-mips/elf.h      Linus Torvalds 2005-04-16  282  #endif

:::::: The code at line 279 was first introduced by commit
:::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2

:::::: TO: Linus Torvalds [off-list ref]
:::::: CC: Linus Torvalds [off-list ref]

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Hi mudongliang,

[auto build test ERROR on: powerpc/next]
[also build test ERROR on: v4.3 next-20151105]

url:    https://github.com/0day-ci/linux/commits/mudongliang/uapi-elf-delete-unused-macros/20151105-234433
base:   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: sparc64-defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=sparc64 

All errors (new ones prefixed by >>):

   In file included from arch/sparc/include/asm/elf.h:4:0,
                    from include/linux/elf.h:4,
                    from fs/proc/kcore.c:17:
   fs/proc/kcore.c: In function 'elf_kcore_store_hdr':

quoted

arch/sparc/include/asm/elf_64.h:106:19: error: 'ELFDATA2MSB' undeclared (first use in this function)

    #define ELF_DATA  ELFDATA2MSB
                      ^
   fs/proc/kcore.c:335:26: note: in expansion of macro 'ELF_DATA'
     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^
   arch/sparc/include/asm/elf_64.h:106:19: note: each undeclared identifier is reported only once for each function it appears in
    #define ELF_DATA  ELFDATA2MSB
                      ^
   fs/proc/kcore.c:335:26: note: in expansion of macro 'ELF_DATA'
     elf->e_ident[EI_DATA] = ELF_DATA;
                             ^

vim +/ELFDATA2MSB +106 arch/sparc/include/asm/elf_64.h

6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   90  #define AV_SPARC_CBCOND		0x02000000 /* CBCOND insns available */
6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   91  
6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   92  /* Solaris decided to enumerate every single crypto instruction type
6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   93   * in the AT_HWCAP bits.  This is wasteful, since if crypto is present,
6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   94   * you still need to look in the CFR register to see if the opcode is
6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   95   * really available.  So we simply advertise only "crypto" support.
6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   96   */
6f859c0e arch/sparc/include/asm/elf_64.h David S. Miller 2012-08-16   97  #define HWCAP_SPARC_CRYPTO	0x04000000 /* CRYPTO insns available */
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17   98  
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17   99  #define CORE_DUMP_USE_REGSET
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  100  
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  101  /*
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  102   * These are used to set parameters in the core dumps.
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  103   */
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  104  #define ELF_ARCH		EM_SPARCV9
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  105  #define ELF_CLASS		ELFCLASS64
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17 @106  #define ELF_DATA		ELFDATA2MSB
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  107  
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  108  /* Format of 64-bit elf_gregset_t is:
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  109   * 	G0 --> G7
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  110   * 	O0 --> O7
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  111   * 	L0 --> L7
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  112   * 	I0 --> I7
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  113   *	TSTATE
f5e706ad include/asm-sparc/elf_64.h      Sam Ravnborg    2008-07-17  114   *	TPC

:::::: The code at line 106 was first introduced by commit
:::::: f5e706ad886b6a5eb59637830110b09ccebf01c5 sparc: join the remaining header files

:::::: TO: Sam Ravnborg [off-list ref]
:::::: CC: David S. Miller [off-list ref]

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation