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

Commit 7e02cb94 authored by Adrian Bunk's avatar Adrian Bunk Committed by Thomas Gleixner
Browse files

x86: rename .i assembler includes to .h 



.i is an ending used for preprocessed stuff.

This patch therefore renames assembler include files to .h and guards
the contents with an #ifdef __ASSEMBLY__.

[ tglx: arch/x86 adaptation ]

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3f4ed151

arch/x86/lib/rwlock_64.S

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


#include <linux/linkage.h>

#include <asm/rwlock.h>

#include <asm/alternative-asm.i>

#include <asm/alternative-asm.h>

#include <asm/dwarf2.h>



/* rdi:	pointer to rwlock_t */

arch/x86/lib/semaphore_32.S

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 


#include <linux/linkage.h>

#include <asm/rwlock.h>

#include <asm/alternative-asm.i>

#include <asm/frame.i>

#include <asm/alternative-asm.h>

#include <asm/frame.h>

#include <asm/dwarf2.h>



/*

include/asm-um/alternative-asm.i→include/asm-um/alternative-asm.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __UM_ALTERNATIVE_ASM_I

#define __UM_ALTERNATIVE_ASM_I



#include "asm/arch/alternative-asm.i"

#include "asm/arch/alternative-asm.h"



#endif

include/asm-um/frame.i→include/asm-um/frame.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __UM_FRAME_I

#define __UM_FRAME_I



#include "asm/arch/frame.i"

#include "asm/arch/frame.h"



#endif

include/asm-x86/alternative-asm_32.i→include/asm-x86/alternative-asm.h

+22 −0
Original line number Diff line number Diff line 
#ifdef __ASSEMBLY__



#ifdef CONFIG_X86_32

# define X86_ALIGN .long

#else

# define X86_ALIGN .quad

#endif



#ifdef CONFIG_SMP

	.macro LOCK_PREFIX

1:	lock

	.section .smp_locks,"a"

	.align 4

	.long 1b

	X86_ALIGN 1b

	.previous

	.endm

#else

	.macro LOCK_PREFIX

	.endm

#endif



#endif  /*  __ASSEMBLY__  */