GIT e7dd49b206624021c23a27512d2a31503f5207f2 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/viro/bird.git#upf.b14 commit e7dd49b206624021c23a27512d2a31503f5207f2 Author: Al Viro Date: Fri Feb 3 20:14:13 2006 -0500 [PATCH] more upf_t annotations Signed-off-by: Al Viro --- Signed-off-by: Andrew Morton --- drivers/serial/8250.h | 2 +- drivers/serial/m32r_sio.h | 2 +- include/asm-alpha/serial.h | 8 ++++---- include/asm-frv/serial.h | 2 +- include/asm-i386/serial.h | 8 ++++---- include/asm-m68k/serial.h | 8 ++++---- include/asm-ppc/pc_serial.h | 8 ++++---- include/asm-x86_64/serial.h | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) diff -puN drivers/serial/8250.h~git-viro-bird-upf drivers/serial/8250.h --- devel/drivers/serial/8250.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/drivers/serial/8250.h 2006-05-19 16:01:56.000000000 -0700 @@ -23,7 +23,7 @@ struct old_serial_port { unsigned int baud_base; unsigned int port; unsigned int irq; - unsigned int flags; + upf_t flags; unsigned char hub6; unsigned char io_type; unsigned char *iomem_base; diff -puN drivers/serial/m32r_sio.h~git-viro-bird-upf drivers/serial/m32r_sio.h --- devel/drivers/serial/m32r_sio.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/drivers/serial/m32r_sio.h 2006-05-19 16:01:56.000000000 -0700 @@ -35,7 +35,7 @@ struct old_serial_port { unsigned int baud_base; unsigned int port; unsigned int irq; - unsigned int flags; + upf_t flags; unsigned char io_type; unsigned char __iomem *iomem_base; unsigned short iomem_reg_shift; diff -puN include/asm-alpha/serial.h~git-viro-bird-upf include/asm-alpha/serial.h --- devel/include/asm-alpha/serial.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/include/asm-alpha/serial.h 2006-05-19 16:01:56.000000000 -0700 @@ -14,11 +14,11 @@ /* Standard COM flags (except for COM4, because of the 8514 problem) */ #ifdef CONFIG_SERIAL_DETECT_IRQ -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) -#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ) +#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ) #else -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) -#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) +#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF #endif #define SERIAL_PORT_DFNS \ diff -puN include/asm-frv/serial.h~git-viro-bird-upf include/asm-frv/serial.h --- devel/include/asm-frv/serial.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/include/asm-frv/serial.h 2006-05-19 16:01:56.000000000 -0700 @@ -13,6 +13,6 @@ */ #define BASE_BAUD 0 -#define STD_COM_FLAGS ASYNC_BOOT_AUTOCONF +#define STD_COM_FLAGS UPF_BOOT_AUTOCONF #define SERIAL_PORT_DFNS diff -puN include/asm-i386/serial.h~git-viro-bird-upf include/asm-i386/serial.h --- devel/include/asm-i386/serial.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/include/asm-i386/serial.h 2006-05-19 16:01:56.000000000 -0700 @@ -14,11 +14,11 @@ /* Standard COM flags (except for COM4, because of the 8514 problem) */ #ifdef CONFIG_SERIAL_DETECT_IRQ -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) -#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ) +#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ) #else -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) -#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) +#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF #endif #define SERIAL_PORT_DFNS \ diff -puN include/asm-m68k/serial.h~git-viro-bird-upf include/asm-m68k/serial.h --- devel/include/asm-m68k/serial.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/include/asm-m68k/serial.h 2006-05-19 16:01:56.000000000 -0700 @@ -18,11 +18,11 @@ /* Standard COM flags (except for COM4, because of the 8514 problem) */ #ifdef CONFIG_SERIAL_DETECT_IRQ -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) -#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ) +#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ) #else -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) -#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) +#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF #endif #define SERIAL_PORT_DFNS \ diff -puN include/asm-ppc/pc_serial.h~git-viro-bird-upf include/asm-ppc/pc_serial.h --- devel/include/asm-ppc/pc_serial.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/include/asm-ppc/pc_serial.h 2006-05-19 16:01:56.000000000 -0700 @@ -27,11 +27,11 @@ /* Standard COM flags (except for COM4, because of the 8514 problem) */ #ifdef CONFIG_SERIAL_DETECT_IRQ -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) -#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ) +#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ) #else -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) -#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) +#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF #endif #define SERIAL_PORT_DFNS \ diff -puN include/asm-x86_64/serial.h~git-viro-bird-upf include/asm-x86_64/serial.h --- devel/include/asm-x86_64/serial.h~git-viro-bird-upf 2006-05-19 16:01:56.000000000 -0700 +++ devel-akpm/include/asm-x86_64/serial.h 2006-05-19 16:01:56.000000000 -0700 @@ -14,11 +14,11 @@ /* Standard COM flags (except for COM4, because of the 8514 problem) */ #ifdef CONFIG_SERIAL_DETECT_IRQ -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) -#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ) +#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ) #else -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) -#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF +#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) +#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF #endif #define SERIAL_PORT_DFNS \ _