Commit 3b1307e1 authored by Thomas Huth's avatar Thomas Huth Committed by Andreas Larsson
Browse files

sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers 



While the GCC and Clang compilers already define __ASSEMBLER__
automatically when compiling assembly code, __ASSEMBLY__ is a
macro that only gets defined by the Makefiles in the kernel.
This can be very confusing when switching between userspace
and kernelspace coding, or when dealing with uapi headers that
rather should use __ASSEMBLER__ instead. So let's standardize on
the __ASSEMBLER__ macro that is provided by the compilers now.

This is a completely mechanical patch (done with a simple "sed -i"
statement).

Cc: David S. Miller <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: sparclinux@vger.kernel.org
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarAndreas Larsson <andreas@gaisler.com>
Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
parent d6fb6511

arch/sparc/include/asm/adi_64.h

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


#include <linux/types.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct adi_caps {

	__u64 blksz;
@@ -41,6 +41,6 @@ static inline unsigned long adi_nbits(void) 
	return adi_state.caps.nbits;

}



#endif	/* __ASSEMBLY__ */

#endif	/* __ASSEMBLER__ */



#endif	/* !(__ASM_SPARC64_ADI_H) */

arch/sparc/include/asm/auxio.h

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
#ifndef ___ASM_SPARC_AUXIO_H

#define ___ASM_SPARC_AUXIO_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



extern void __iomem *auxio_register;



#endif /* ifndef __ASSEMBLY__ */

#endif /* ifndef __ASSEMBLER__ */



#if defined(__sparc__) && defined(__arch64__)

#include <asm/auxio_64.h>

arch/sparc/include/asm/auxio_32.h

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#define AUXIO_FLPY_EJCT   0x02    /* Eject floppy disk.  Write only. */

#define AUXIO_LED         0x01    /* On if set, off if unset. Read/Write */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/*

 * NOTE: these routines are implementation dependent--
@@ -75,7 +75,7 @@ do { \ 
	} \

} while (0)



#endif /* !(__ASSEMBLY__) */

#endif /* !(__ASSEMBLER__) */





/* AUXIO2 (Power Off Control) */

arch/sparc/include/asm/auxio_64.h

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#define AUXIO_PCIO_CPWR_OFF	0x02 /* Courtesy Power Off	*/

#define AUXIO_PCIO_SPWR_OFF	0x01 /* System Power Off	*/



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define AUXIO_LTE_ON	1

#define AUXIO_LTE_OFF	0
@@ -94,6 +94,6 @@ void auxio_set_lte(int on); 
 */

void auxio_set_led(int on);



#endif /* ifndef __ASSEMBLY__ */

#endif /* ifndef __ASSEMBLER__ */



#endif /* !(_SPARC64_AUXIO_H) */

arch/sparc/include/asm/cacheflush_64.h

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


#include <asm/page.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/mm.h>
@@ -78,6 +78,6 @@ void flush_ptrace_access(struct vm_area_struct *, struct page *, 
#define flush_cache_vmap_early(start, end)	do { } while (0)

#define flush_cache_vunmap(start, end)		do { } while (0)



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */



#endif /* _SPARC64_CACHEFLUSH_H */