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

Commit 490be340 authored by Alex Sverdlin's avatar Alex Sverdlin Committed by Greg Kroah-Hartman
Browse files

ARM: 9077/1: PLT: Move struct plt_entries definition to header 



commit 4e271701c17dee70c6e1351c4d7d42e70405c6a9 upstream

No functional change, later it will be re-used in several files.

Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 278df064

arch/arm/include/asm/module.h

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,15 @@ enum { 
};

#endif



#define PLT_ENT_STRIDE		L1_CACHE_BYTES

#define PLT_ENT_COUNT		(PLT_ENT_STRIDE / sizeof(u32))

#define PLT_ENT_SIZE		(sizeof(struct plt_entries) / PLT_ENT_COUNT)



struct plt_entries {

	u32	ldr[PLT_ENT_COUNT];

	u32	lit[PLT_ENT_COUNT];

};



struct mod_plt_sec {

	struct elf32_shdr	*plt;

	int			plt_count;

arch/arm/kernel/module-plts.c

+0 −9
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
#include <asm/cache.h>

#include <asm/opcodes.h>



#define PLT_ENT_STRIDE		L1_CACHE_BYTES

#define PLT_ENT_COUNT		(PLT_ENT_STRIDE / sizeof(u32))

#define PLT_ENT_SIZE		(sizeof(struct plt_entries) / PLT_ENT_COUNT)



#ifdef CONFIG_THUMB2_KERNEL

#define PLT_ENT_LDR		__opcode_to_mem_thumb32(0xf8dff000 | \

							(PLT_ENT_STRIDE - 4))
@@ -23,11 +19,6 @@ 
						    (PLT_ENT_STRIDE - 8))

#endif



struct plt_entries {

	u32	ldr[PLT_ENT_COUNT];

	u32	lit[PLT_ENT_COUNT];

};



static bool in_init(const struct module *mod, unsigned long loc)

{

	return loc - (u32)mod->init_layout.base < mod->init_layout.size;