tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] powerpc: Standardize on _ASM_POWERPC header symbol prefix

Standardize on _ASM_POWERPC_... prefix for all #include
exclusion symbols. Fixup all the non-compilers.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

jdl@freescale.com and committed by
Paul Mackerras a37c8875 38c0ff06

+73 -74
+4 -4
include/asm-powerpc/8253pit.h
··· 1 + #ifndef _ASM_POWERPC_8253PIT_H 2 + #define _ASM_POWERPC_8253PIT_H 3 + 1 4 /* 2 5 * 8253/8254 Programmable Interval Timer 3 6 */ 4 7 5 - #ifndef _8253PIT_H 6 - #define _8253PIT_H 7 - 8 8 #define PIT_TICK_RATE 1193182UL 9 9 10 - #endif 10 + #endif /* _ASM_POWERPC_8253PIT_H */
+3 -5
include/asm-powerpc/agp.h
··· 1 - #ifndef AGP_H 2 - #define AGP_H 1 1 + #ifndef _ASM_POWERPC_AGP_H 2 + #define _ASM_POWERPC_AGP_H 3 3 4 4 #include <asm/io.h> 5 - 6 - /* nothing much needed here */ 7 5 8 6 #define map_page_into_agp(page) 9 7 #define unmap_page_from_agp(page) ··· 18 20 #define free_gatt_pages(table, order) \ 19 21 free_pages((unsigned long)(table), (order)) 20 22 21 - #endif 23 + #endif /* _ASM_POWERPC_AGP_H */
+3 -3
include/asm-powerpc/bugs.h
··· 1 - #ifndef _POWERPC_BUGS_H 2 - #define _POWERPC_BUGS_H 1 + #ifndef _ASM_POWERPC_BUGS_H 2 + #define _ASM_POWERPC_BUGS_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 15 15 16 16 extern void check_bugs(void); 17 17 18 - #endif /* _POWERPC_BUGS_H */ 18 + #endif /* _ASM_POWERPC_BUGS_H */
+3 -3
include/asm-powerpc/errno.h
··· 1 - #ifndef _PPC_ERRNO_H 2 - #define _PPC_ERRNO_H 1 + #ifndef _ASM_POWERPC_ERRNO_H 2 + #define _ASM_POWERPC_ERRNO_H 3 3 4 4 #include <asm-generic/errno.h> 5 5 ··· 8 8 9 9 #define _LAST_ERRNO 516 10 10 11 - #endif 11 + #endif /* _ASM_POWERPC_ERRNO_H */
+3 -3
include/asm-powerpc/ioctl.h
··· 1 - #ifndef _PPC_IOCTL_H 2 - #define _PPC_IOCTL_H 1 + #ifndef _ASM_POWERPC_IOCTL_H 2 + #define _ASM_POWERPC_IOCTL_H 3 3 4 4 5 5 /* ··· 66 66 #define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT) 67 67 #define IOCSIZE_SHIFT (_IOC_SIZESHIFT) 68 68 69 - #endif 69 + #endif /* _ASM_POWERPC_IOCTL_H */
+3 -3
include/asm-powerpc/ioctls.h
··· 1 - #ifndef _ASM_PPC_IOCTLS_H 2 - #define _ASM_PPC_IOCTLS_H 1 + #ifndef _ASM_POWERPC_IOCTLS_H 2 + #define _ASM_POWERPC_IOCTLS_H 3 3 4 4 #include <asm/ioctl.h> 5 5 ··· 104 104 #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ 105 105 #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ 106 106 107 - #endif /* _ASM_PPC_IOCTLS_H */ 107 + #endif /* _ASM_POWERPC_IOCTLS_H */
+3 -3
include/asm-powerpc/linkage.h
··· 1 - #ifndef __ASM_LINKAGE_H 2 - #define __ASM_LINKAGE_H 1 + #ifndef _ASM_POWERPC_LINKAGE_H 2 + #define _ASM_POWERPC_LINKAGE_H 3 3 4 4 /* Nothing to see here... */ 5 5 6 - #endif 6 + #endif /* _ASM_POWERPC_LINKAGE_H */
+3 -3
include/asm-powerpc/mc146818rtc.h
··· 1 - #ifndef _POWERPC_MC146818RTC_H 2 - #define _POWERPC_MC146818RTC_H 1 + #ifndef _ASM_POWERPC_MC146818RTC_H 2 + #define _ASM_POWERPC_MC146818RTC_H 3 3 4 4 /* 5 5 * Machine dependent access functions for RTC registers. ··· 33 33 }) 34 34 35 35 #endif /* __KERNEL__ */ 36 - #endif /* _POWERPC_MC146818RTC_H */ 36 + #endif /* _ASM_POWERPC_MC146818RTC_H */
+3 -3
include/asm-powerpc/mman.h
··· 1 - #ifndef _POWERPC_MMAN_H 2 - #define _POWERPC_MMAN_H 1 + #ifndef _ASM_POWERPC_MMAN_H 2 + #define _ASM_POWERPC_MMAN_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 49 49 #define MAP_ANON MAP_ANONYMOUS 50 50 #define MAP_FILE 0 51 51 52 - #endif /* _POWERPC_MMAN_H */ 52 + #endif /* _ASM_POWERPC_MMAN_H */
+3 -3
include/asm-powerpc/module.h
··· 1 - #ifndef _POWERPC_MODULE_H 2 - #define _POWERPC_MODULE_H 1 + #ifndef _ASM_POWERPC_MODULE_H 2 + #define _ASM_POWERPC_MODULE_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 74 74 void sort_ex_table(struct exception_table_entry *start, 75 75 struct exception_table_entry *finish); 76 76 77 - #endif /* _POWERPC_MODULE_H */ 77 + #endif /* _ASM_POWERPC_MODULE_H */
+7 -7
include/asm-powerpc/namei.h
··· 1 + #ifndef _ASM_POWERPC_NAMEI_H 2 + #define _ASM_POWERPC_NAMEI_H 3 + 4 + #ifdef __KERNEL__ 5 + 1 6 /* 2 - * include/asm-ppc/namei.h 3 7 * Adapted from include/asm-alpha/namei.h 4 8 * 5 9 * Included from fs/namei.c 6 10 */ 7 - 8 - #ifdef __KERNEL__ 9 - #ifndef __PPC_NAMEI_H 10 - #define __PPC_NAMEI_H 11 11 12 12 /* This dummy routine maybe changed to something useful 13 13 * for /usr/gnemul/ emulation stuff. ··· 16 16 17 17 #define __emul_prefix() NULL 18 18 19 - #endif /* __PPC_NAMEI_H */ 20 - #endif /* __KERNEL__ */ 19 + #endif /* __KERNEL__ */ 20 + #endif /* _ASM_POWERPC_NAMEI_H */
+3 -3
include/asm-powerpc/poll.h
··· 1 - #ifndef __PPC_POLL_H 2 - #define __PPC_POLL_H 1 + #ifndef _ASM_POWERPC_POLL_H 2 + #define _ASM_POWERPC_POLL_H 3 3 4 4 #define POLLIN 0x0001 5 5 #define POLLPRI 0x0002 ··· 20 20 short revents; 21 21 }; 22 22 23 - #endif 23 + #endif /* _ASM_POWERPC_POLL_H */
+3 -3
include/asm-powerpc/sembuf.h
··· 1 - #ifndef _POWERPC_SEMBUF_H 2 - #define _POWERPC_SEMBUF_H 1 + #ifndef _ASM_POWERPC_SEMBUF_H 2 + #define _ASM_POWERPC_SEMBUF_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 33 33 unsigned long __unused4; 34 34 }; 35 35 36 - #endif /* _POWERPC_SEMBUF_H */ 36 + #endif /* _ASM_POWERPC_SEMBUF_H */
+3 -3
include/asm-powerpc/shmbuf.h
··· 1 - #ifndef _POWERPC_SHMBUF_H 2 - #define _POWERPC_SHMBUF_H 1 + #ifndef _ASM_POWERPC_SHMBUF_H 2 + #define _ASM_POWERPC_SHMBUF_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 56 56 unsigned long __unused4; 57 57 }; 58 58 59 - #endif /* _POWERPC_SHMBUF_H */ 59 + #endif /* _ASM_POWERPC_SHMBUF_H */
+3 -3
include/asm-powerpc/shmparam.h
··· 1 - #ifndef _PPC_SHMPARAM_H 2 - #define _PPC_SHMPARAM_H 1 + #ifndef _ASM_POWERPC_SHMPARAM_H 2 + #define _ASM_POWERPC_SHMPARAM_H 3 3 4 4 #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ 5 5 6 - #endif /* _PPC_SHMPARAM_H */ 6 + #endif /* _ASM_POWERPC_SHMPARAM_H */
+3 -3
include/asm-powerpc/siginfo.h
··· 1 - #ifndef _POWERPC_SIGINFO_H 2 - #define _POWERPC_SIGINFO_H 1 + #ifndef _ASM_POWERPC_SIGINFO_H 2 + #define _ASM_POWERPC_SIGINFO_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 15 15 16 16 #include <asm-generic/siginfo.h> 17 17 18 - #endif /* _POWERPC_SIGINFO_H */ 18 + #endif /* _ASM_POWERPC_SIGINFO_H */
+3 -3
include/asm-powerpc/socket.h
··· 1 - #ifndef _POWERPC_SOCKET_H 2 - #define _POWERPC_SOCKET_H 1 + #ifndef _ASM_POWERPC_SOCKET_H 2 + #define _ASM_POWERPC_SOCKET_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 56 56 57 57 #define SO_PEERSEC 31 58 58 59 - #endif /* _POWERPC_SOCKET_H */ 59 + #endif /* _ASM_POWERPC_SOCKET_H */
+3 -3
include/asm-powerpc/sockios.h
··· 1 - #ifndef _POWERPC_SOCKIOS_H 2 - #define _POWERPC_SOCKIOS_H 1 + #ifndef _ASM_POWERPC_SOCKIOS_H 2 + #define _ASM_POWERPC_SOCKIOS_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 16 16 #define SIOCATMARK 0x8905 17 17 #define SIOCGSTAMP 0x8906 /* Get stamp */ 18 18 19 - #endif /* _POWERPC_SOCKIOS_H */ 19 + #endif /* _ASM_POWERPC_SOCKIOS_H */
+3 -3
include/asm-powerpc/string.h
··· 1 - #ifndef _PPC_STRING_H_ 2 - #define _PPC_STRING_H_ 1 + #ifndef _ASM_POWERPC_STRING_H 2 + #define _ASM_POWERPC_STRING_H 3 3 4 4 #ifdef __KERNEL__ 5 5 ··· 29 29 30 30 #endif /* __KERNEL__ */ 31 31 32 - #endif 32 + #endif /* _ASM_POWERPC_STRING_H */
+3 -3
include/asm-powerpc/termbits.h
··· 1 - #ifndef _POWERPC_TERMBITS_H 2 - #define _POWERPC_TERMBITS_H 1 + #ifndef _ASM_POWERPC_TERMBITS_H 2 + #define _ASM_POWERPC_TERMBITS_H 3 3 4 4 /* 5 5 * This program is free software; you can redistribute it and/or ··· 188 188 #define TCSADRAIN 1 189 189 #define TCSAFLUSH 2 190 190 191 - #endif /* _POWERPC_TERMBITS_H */ 191 + #endif /* _ASM_POWERPC_TERMBITS_H */
+3 -3
include/asm-powerpc/termios.h
··· 1 - #ifndef _POWERPC_TERMIOS_H 2 - #define _POWERPC_TERMIOS_H 1 + #ifndef _ASM_POWERPC_TERMIOS_H 2 + #define _ASM_POWERPC_TERMIOS_H 3 3 4 4 /* 5 5 * Liberally adapted from alpha/termios.h. In particular, the c_cc[] ··· 233 233 234 234 #endif /* __KERNEL__ */ 235 235 236 - #endif /* _POWERPC_TERMIOS_H */ 236 + #endif /* _ASM_POWERPC_TERMIOS_H */
+5 -4
include/asm-powerpc/unaligned.h
··· 1 + #ifndef _ASM_POWERPC_UNALIGNED_H 2 + #define _ASM_POWERPC_UNALIGNED_H 3 + 1 4 #ifdef __KERNEL__ 2 - #ifndef __PPC_UNALIGNED_H 3 - #define __PPC_UNALIGNED_H 4 5 5 6 /* 6 7 * The PowerPC can do unaligned accesses itself in big endian mode. ··· 15 14 16 15 #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) )) 17 16 18 - #endif 19 - #endif /* __KERNEL__ */ 17 + #endif /* __KERNEL__ */ 18 + #endif /* _ASM_POWERPC_UNALIGNED_H */