[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>
This commit is contained in:
jdl@freescale.com 2005-09-07 15:27:09 -05:00 committed by Paul Mackerras
parent 38c0ff06d5
commit a37c8875a7
22 changed files with 73 additions and 74 deletions

View File

@ -1,10 +1,10 @@
#ifndef _ASM_POWERPC_8253PIT_H
#define _ASM_POWERPC_8253PIT_H
/*
* 8253/8254 Programmable Interval Timer
*/
#ifndef _8253PIT_H
#define _8253PIT_H
#define PIT_TICK_RATE 1193182UL
#endif
#endif /* _ASM_POWERPC_8253PIT_H */

View File

@ -1,10 +1,8 @@
#ifndef AGP_H
#define AGP_H 1
#ifndef _ASM_POWERPC_AGP_H
#define _ASM_POWERPC_AGP_H
#include <asm/io.h>
/* nothing much needed here */
#define map_page_into_agp(page)
#define unmap_page_from_agp(page)
#define flush_agp_mappings()
@ -20,4 +18,4 @@
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif
#endif /* _ASM_POWERPC_AGP_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_BUGS_H
#define _POWERPC_BUGS_H
#ifndef _ASM_POWERPC_BUGS_H
#define _ASM_POWERPC_BUGS_H
/*
* This program is free software; you can redistribute it and/or
@ -15,4 +15,4 @@
extern void check_bugs(void);
#endif /* _POWERPC_BUGS_H */
#endif /* _ASM_POWERPC_BUGS_H */

View File

@ -1,5 +1,5 @@
#ifndef _PPC_ERRNO_H
#define _PPC_ERRNO_H
#ifndef _ASM_POWERPC_ERRNO_H
#define _ASM_POWERPC_ERRNO_H
#include <asm-generic/errno.h>
@ -8,4 +8,4 @@
#define _LAST_ERRNO 516
#endif
#endif /* _ASM_POWERPC_ERRNO_H */

View File

@ -1,5 +1,5 @@
#ifndef _PPC_IOCTL_H
#define _PPC_IOCTL_H
#ifndef _ASM_POWERPC_IOCTL_H
#define _ASM_POWERPC_IOCTL_H
/*
@ -66,4 +66,4 @@ extern unsigned int __invalid_size_argument_for_IOC;
#define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT)
#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
#endif
#endif /* _ASM_POWERPC_IOCTL_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_PPC_IOCTLS_H
#define _ASM_PPC_IOCTLS_H
#ifndef _ASM_POWERPC_IOCTLS_H
#define _ASM_POWERPC_IOCTLS_H
#include <asm/ioctl.h>
@ -104,4 +104,4 @@
#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#endif /* _ASM_PPC_IOCTLS_H */
#endif /* _ASM_POWERPC_IOCTLS_H */

View File

@ -1,6 +1,6 @@
#ifndef __ASM_LINKAGE_H
#define __ASM_LINKAGE_H
#ifndef _ASM_POWERPC_LINKAGE_H
#define _ASM_POWERPC_LINKAGE_H
/* Nothing to see here... */
#endif
#endif /* _ASM_POWERPC_LINKAGE_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_MC146818RTC_H
#define _POWERPC_MC146818RTC_H
#ifndef _ASM_POWERPC_MC146818RTC_H
#define _ASM_POWERPC_MC146818RTC_H
/*
* Machine dependent access functions for RTC registers.
@ -33,4 +33,4 @@ outb_p((val),RTC_PORT(1)); \
})
#endif /* __KERNEL__ */
#endif /* _POWERPC_MC146818RTC_H */
#endif /* _ASM_POWERPC_MC146818RTC_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_MMAN_H
#define _POWERPC_MMAN_H
#ifndef _ASM_POWERPC_MMAN_H
#define _ASM_POWERPC_MMAN_H
/*
* This program is free software; you can redistribute it and/or
@ -49,4 +49,4 @@
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FILE 0
#endif /* _POWERPC_MMAN_H */
#endif /* _ASM_POWERPC_MMAN_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_MODULE_H
#define _POWERPC_MODULE_H
#ifndef _ASM_POWERPC_MODULE_H
#define _ASM_POWERPC_MODULE_H
/*
* This program is free software; you can redistribute it and/or
@ -74,4 +74,4 @@ struct exception_table_entry;
void sort_ex_table(struct exception_table_entry *start,
struct exception_table_entry *finish);
#endif /* _POWERPC_MODULE_H */
#endif /* _ASM_POWERPC_MODULE_H */

View File

@ -1,14 +1,14 @@
#ifndef _ASM_POWERPC_NAMEI_H
#define _ASM_POWERPC_NAMEI_H
#ifdef __KERNEL__
/*
* include/asm-ppc/namei.h
* Adapted from include/asm-alpha/namei.h
*
* Included from fs/namei.c
*/
#ifdef __KERNEL__
#ifndef __PPC_NAMEI_H
#define __PPC_NAMEI_H
/* This dummy routine maybe changed to something useful
* for /usr/gnemul/ emulation stuff.
* Look at asm-sparc/namei.h for details.
@ -16,5 +16,5 @@
#define __emul_prefix() NULL
#endif /* __PPC_NAMEI_H */
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_NAMEI_H */

View File

@ -1,5 +1,5 @@
#ifndef __PPC_POLL_H
#define __PPC_POLL_H
#ifndef _ASM_POWERPC_POLL_H
#define _ASM_POWERPC_POLL_H
#define POLLIN 0x0001
#define POLLPRI 0x0002
@ -20,4 +20,4 @@ struct pollfd {
short revents;
};
#endif
#endif /* _ASM_POWERPC_POLL_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_SEMBUF_H
#define _POWERPC_SEMBUF_H
#ifndef _ASM_POWERPC_SEMBUF_H
#define _ASM_POWERPC_SEMBUF_H
/*
* This program is free software; you can redistribute it and/or
@ -33,4 +33,4 @@ struct semid64_ds {
unsigned long __unused4;
};
#endif /* _POWERPC_SEMBUF_H */
#endif /* _ASM_POWERPC_SEMBUF_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_SHMBUF_H
#define _POWERPC_SHMBUF_H
#ifndef _ASM_POWERPC_SHMBUF_H
#define _ASM_POWERPC_SHMBUF_H
/*
* This program is free software; you can redistribute it and/or
@ -56,4 +56,4 @@ struct shminfo64 {
unsigned long __unused4;
};
#endif /* _POWERPC_SHMBUF_H */
#endif /* _ASM_POWERPC_SHMBUF_H */

View File

@ -1,6 +1,6 @@
#ifndef _PPC_SHMPARAM_H
#define _PPC_SHMPARAM_H
#ifndef _ASM_POWERPC_SHMPARAM_H
#define _ASM_POWERPC_SHMPARAM_H
#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
#endif /* _PPC_SHMPARAM_H */
#endif /* _ASM_POWERPC_SHMPARAM_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_SIGINFO_H
#define _POWERPC_SIGINFO_H
#ifndef _ASM_POWERPC_SIGINFO_H
#define _ASM_POWERPC_SIGINFO_H
/*
* This program is free software; you can redistribute it and/or
@ -15,4 +15,4 @@
#include <asm-generic/siginfo.h>
#endif /* _POWERPC_SIGINFO_H */
#endif /* _ASM_POWERPC_SIGINFO_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_SOCKET_H
#define _POWERPC_SOCKET_H
#ifndef _ASM_POWERPC_SOCKET_H
#define _ASM_POWERPC_SOCKET_H
/*
* This program is free software; you can redistribute it and/or
@ -56,4 +56,4 @@
#define SO_PEERSEC 31
#endif /* _POWERPC_SOCKET_H */
#endif /* _ASM_POWERPC_SOCKET_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_SOCKIOS_H
#define _POWERPC_SOCKIOS_H
#ifndef _ASM_POWERPC_SOCKIOS_H
#define _ASM_POWERPC_SOCKIOS_H
/*
* This program is free software; you can redistribute it and/or
@ -16,4 +16,4 @@
#define SIOCATMARK 0x8905
#define SIOCGSTAMP 0x8906 /* Get stamp */
#endif /* _POWERPC_SOCKIOS_H */
#endif /* _ASM_POWERPC_SOCKIOS_H */

View File

@ -1,5 +1,5 @@
#ifndef _PPC_STRING_H_
#define _PPC_STRING_H_
#ifndef _ASM_POWERPC_STRING_H
#define _ASM_POWERPC_STRING_H
#ifdef __KERNEL__
@ -29,4 +29,4 @@ extern void * memchr(const void *,int,__kernel_size_t);
#endif /* __KERNEL__ */
#endif
#endif /* _ASM_POWERPC_STRING_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_TERMBITS_H
#define _POWERPC_TERMBITS_H
#ifndef _ASM_POWERPC_TERMBITS_H
#define _ASM_POWERPC_TERMBITS_H
/*
* This program is free software; you can redistribute it and/or
@ -188,4 +188,4 @@ struct termios {
#define TCSADRAIN 1
#define TCSAFLUSH 2
#endif /* _POWERPC_TERMBITS_H */
#endif /* _ASM_POWERPC_TERMBITS_H */

View File

@ -1,5 +1,5 @@
#ifndef _POWERPC_TERMIOS_H
#define _POWERPC_TERMIOS_H
#ifndef _ASM_POWERPC_TERMIOS_H
#define _ASM_POWERPC_TERMIOS_H
/*
* Liberally adapted from alpha/termios.h. In particular, the c_cc[]
@ -233,4 +233,4 @@ struct termio {
#endif /* __KERNEL__ */
#endif /* _POWERPC_TERMIOS_H */
#endif /* _ASM_POWERPC_TERMIOS_H */

View File

@ -1,6 +1,7 @@
#ifndef _ASM_POWERPC_UNALIGNED_H
#define _ASM_POWERPC_UNALIGNED_H
#ifdef __KERNEL__
#ifndef __PPC_UNALIGNED_H
#define __PPC_UNALIGNED_H
/*
* The PowerPC can do unaligned accesses itself in big endian mode.
@ -14,5 +15,5 @@
#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
#endif
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_UNALIGNED_H */