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

Commit 13851966 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Add .type and .size to ASM functions 



Cachegrind analysis need this fix to be able to log asm functions.

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent e84452dd

arch/microblaze/kernel/misc.S

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 * We avoid flushing the pinned 0, 1 and possibly 2 entries.

 */

.globl _tlbia;

.type  _tlbia, @function

.align 4;

_tlbia:

	addik	r12, r0, 63 /* flush all entries (63 - 3) */
@@ -41,11 +42,13 @@ _tlbia_1: 
	/* sync */

	rtsd	r15, 8

	nop

	.size  _tlbia, . - _tlbia



/*

 * Flush MMU TLB for a particular address (in r5)

 */

.globl _tlbie;

.type  _tlbie, @function

.align 4;

_tlbie:

	mts	rtlbsx, r5 /* look up the address in TLB */
@@ -59,10 +62,13 @@ _tlbie_1: 
	rtsd	r15, 8

	nop



	.size  _tlbie, . - _tlbie



/*

 * Allocate TLB entry for early console

 */

.globl early_console_reg_tlb_alloc;

.type  early_console_reg_tlb_alloc, @function

.align 4;

early_console_reg_tlb_alloc:

	/*
@@ -86,6 +92,8 @@ early_console_reg_tlb_alloc: 
	rtsd	r15, 8

	nop



	.size  early_console_reg_tlb_alloc, . - early_console_reg_tlb_alloc



/*

 * Copy a whole page (4096 bytes).

 */
@@ -104,6 +112,7 @@ early_console_reg_tlb_alloc: 
#define DCACHE_LINE_BYTES (4 * 4)



.globl copy_page;

.type  copy_page, @function

.align 4;

copy_page:

	ori	r11, r0, (PAGE_SIZE/DCACHE_LINE_BYTES) - 1
@@ -118,3 +127,5 @@ _copy_page_loop: 
	addik	r11, r11, -1

	rtsd	r15, 8

	nop



	.size  copy_page, . - copy_page

arch/microblaze/lib/fastcopy.S

+5 −1
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ 
 */



#include <linux/linkage.h>



	.text

	.globl	memcpy

	.type  memcpy, @function

	.ent	memcpy



memcpy:
@@ -345,9 +346,11 @@ a_done: 
	rtsd	r15, 8

	nop



.size  memcpy, . - memcpy

.end memcpy

/*----------------------------------------------------------------------------*/

	.globl	memmove

	.type  memmove, @function

	.ent	memmove



memmove:
@@ -659,4 +662,5 @@ d_done: 
	rtsd	r15, 8

	nop



.size  memmove, . - memmove

.end memmove

arch/microblaze/lib/uaccess_old.S

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


	.text

.globl __strncpy_user;

.type  __strncpy_user, @function

.align 4;

__strncpy_user:
@@ -50,6 +51,7 @@ __strncpy_user: 
3:

	rtsd	r15,8

	nop

	.size   __strncpy_user, . - __strncpy_user





	.section	.fixup, "ax"
@@ -72,6 +74,7 @@ __strncpy_user: 


	.text

.globl __strnlen_user;

.type  __strnlen_user, @function

.align 4;

__strnlen_user:

	addik	r3,r6,0
@@ -90,6 +93,7 @@ __strnlen_user: 
3:

	rtsd	r15,8

	nop

	.size   __strnlen_user, . - __strnlen_user





	.section	.fixup,"ax"
@@ -108,6 +112,7 @@ __strnlen_user: 
 */

	.text

.globl __copy_tofrom_user;

.type  __copy_tofrom_user, @function

.align 4;

__copy_tofrom_user:

	/*
@@ -129,6 +134,7 @@ __copy_tofrom_user: 
3:

	rtsd	r15,8

	nop

	.size   __copy_tofrom_user, . - __copy_tofrom_user





	.section	__ex_table,"a"