Commit e7f2c8c1 authored by Chen Gang's avatar Chen Gang Committed by Hans-Christian Egtvedt
Browse files

avr32: uapi: be sure of "_UAPI" prefix for all guard macros 



For all uapi headers, need use "_UAPI" prefix for its guard macro
(which will be stripped by "scripts/headers_installer.sh").

Also remove redundant files (bitsperlong.h, errno.h, fcntl.h, ioctl.h,
ioctls.h, ipcbuf.h, kvm_para.h, mman.h, poll.h, resource.h, siginfo.h,
statfs.h, and unistd.h) which are already in Kbuild.

Also be sure that all "#endif" only have one empty line above, and each
file has guard macro.

Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
Signed-off-by: default avatarHans-Christian Egtvedt <hegtvedt@cisco.com>
parent dbc0d691

arch/avr32/include/uapi/asm/Kbuild

+12 −12
Original line number Diff line number Diff line
@@ -2,35 +2,35 @@ 
include include/uapi/asm-generic/Kbuild.asm



header-y += auxvec.h

header-y += bitsperlong.h

header-y += byteorder.h

header-y += cachectl.h

header-y += errno.h

header-y += fcntl.h

header-y += ioctl.h

header-y += ioctls.h

header-y += ipcbuf.h

header-y += kvm_para.h

header-y += mman.h

header-y += msgbuf.h

header-y += param.h

header-y += poll.h

header-y += posix_types.h

header-y += ptrace.h

header-y += resource.h

header-y += sembuf.h

header-y += setup.h

header-y += shmbuf.h

header-y += sigcontext.h

header-y += siginfo.h

header-y += signal.h

header-y += socket.h

header-y += sockios.h

header-y += stat.h

header-y += statfs.h

header-y += swab.h

header-y += termbits.h

header-y += termios.h

header-y += types.h

header-y += unistd.h

generic-y += bitsperlong.h

generic-y += errno.h

generic-y += fcntl.h

generic-y += ioctl.h

generic-y += ioctls.h

generic-y += ipcbuf.h

generic-y += kvm_para.h

generic-y += mman.h

generic-y += param.h

generic-y += poll.h

generic-y += resource.h

generic-y += siginfo.h

generic-y += statfs.h

arch/avr32/include/uapi/asm/auxvec.h

+3 −3
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_AUXVEC_H

#define __ASM_AVR32_AUXVEC_H

#ifndef _UAPI__ASM_AVR32_AUXVEC_H

#define _UAPI__ASM_AVR32_AUXVEC_H



#endif /* __ASM_AVR32_AUXVEC_H */
 
#endif /* _UAPI__ASM_AVR32_AUXVEC_H */

arch/avr32/include/uapi/asm/bitsperlong.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/bitsperlong.h>

arch/avr32/include/uapi/asm/byteorder.h

+3 −3
Original line number Diff line number Diff line 
/*

 * AVR32 endian-conversion functions.

 */

#ifndef __ASM_AVR32_BYTEORDER_H

#define __ASM_AVR32_BYTEORDER_H

#ifndef _UAPI__ASM_AVR32_BYTEORDER_H

#define _UAPI__ASM_AVR32_BYTEORDER_H



#include <linux/byteorder/big_endian.h>



#endif /* __ASM_AVR32_BYTEORDER_H */
 
#endif /* _UAPI__ASM_AVR32_BYTEORDER_H */

arch/avr32/include/uapi/asm/cachectl.h

+3 −3
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_CACHECTL_H

#define __ASM_AVR32_CACHECTL_H

#ifndef _UAPI__ASM_AVR32_CACHECTL_H

#define _UAPI__ASM_AVR32_CACHECTL_H



/*

 * Operations that can be performed through the cacheflush system call
@@ -8,4 +8,4 @@ 
/* Clean the data cache, then invalidate the icache */

#define CACHE_IFLUSH	0



#endif /* __ASM_AVR32_CACHECTL_H */
 
#endif /* _UAPI__ASM_AVR32_CACHECTL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE