Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 516c25a8 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

Cleanup asm/{elf,page,user}.h: #ifdef __KERNEL__ is no longer needed 



asm/elf.h, asm/page.h and asm/user.h don't export to userspace now, so we can
drop #ifdef __KERNEL__ for them.

[k.shutemov@gmail.com: remove #ifdef __KERNEL_]
Signed-off-by: default avatarKirill A. Shutemov <k.shutemov@gmail.com>
Reviewed-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarKirill A. Shutemov <k.shutemov@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c1445db9

include/asm-alpha/elf.h

+0 −3
Original line number Diff line number Diff line
@@ -144,8 +144,6 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task); 
	: amask (AMASK_CIX) ? "ev6" : "ev67");	\

})



#ifdef __KERNEL__



#define SET_PERSONALITY(EX, IBCS2)				\

	set_personality(((EX).e_flags & EF_ALPHA_32BIT)		\

	   ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)
@@ -164,5 +162,4 @@ extern int alpha_l3_cacheshape; 
    NEW_AUX_ENT(AT_L3_CACHESHAPE, alpha_l3_cacheshape);		\

  } while (0)



#endif /* __KERNEL__ */

#endif /* __ASM_ALPHA_ELF_H */

include/asm-alpha/page.h

+0 −3
Original line number Diff line number Diff line 
#ifndef _ALPHA_PAGE_H

#define _ALPHA_PAGE_H



#ifdef __KERNEL__



#include <linux/const.h>

#include <asm/pal.h>
@@ -98,5 +96,4 @@ typedef unsigned long pgprot_t; 
#include <asm-generic/memory_model.h>

#include <asm-generic/page.h>



#endif /* __KERNEL__ */

#endif /* _ALPHA_PAGE_H */

include/asm-arm/elf.h

+0 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ typedef struct user_fp elf_fpregset_t; 
#endif

#define ELF_ARCH	EM_ARM



#ifdef __KERNEL__

#ifndef __ASSEMBLY__

/*

 * This yields a string that ld.so will use to load implementation
@@ -115,5 +114,3 @@ extern char elf_platform[]; 
	} while (0)



#endif
 


#endif

include/asm-arm/page.h

+0 −5
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
#ifndef _ASMARM_PAGE_H

#define _ASMARM_PAGE_H





#ifdef __KERNEL__



/* PAGE_SHIFT determines the page size */

#define PAGE_SHIFT		12

#define PAGE_SIZE		(1UL << PAGE_SHIFT)
@@ -192,6 +189,4 @@ typedef unsigned long pgprot_t; 


#include <asm-generic/page.h>



#endif /* __KERNEL__ */



#endif

include/asm-avr32/elf.h

+0 −2
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ typedef struct user_fpu_struct elf_fpregset_t; 


#define ELF_PLATFORM  (NULL)



#ifdef __KERNEL__

#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)

#endif



#endif /* __ASM_AVR32_ELF_H */