4 files changed, 56 insertions, 40 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 02a585faa62c..860e7a485a5f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -392,8 +392,8 @@ struct request_queue
         unsigned int            nr_congestion_off;
         unsigned int            nr_batching;
 
-        unsigned short          max_sectors;
-        unsigned short          max_hw_sectors;
+        unsigned int            max_sectors;
+        unsigned int            max_hw_sectors;
         unsigned short          max_phys_segments;
         unsigned short          max_hw_segments;
         unsigned short          hardsect_size;
@@ -697,7 +697,7 @@ extern request_queue_t *blk_init_queue(request_fn_proc *, spinlock_t *);
 extern void blk_cleanup_queue(request_queue_t *);
 extern void blk_queue_make_request(request_queue_t *, make_request_fn *);
 extern void blk_queue_bounce_limit(request_queue_t *, u64);
-extern void blk_queue_max_sectors(request_queue_t *, unsigned short);
+extern void blk_queue_max_sectors(request_queue_t *, unsigned int);
 extern void blk_queue_max_phys_segments(request_queue_t *, unsigned short);
 extern void blk_queue_max_hw_segments(request_queue_t *, unsigned short);
 extern void blk_queue_max_segment_size(request_queue_t *, unsigned int);
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 59ff6c430cf6..6500d4e59d46 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -19,7 +19,21 @@ struct xt_get_revision
 /* For standard target */
 #define XT_RETURN (-NF_REPEAT - 1)
 
-#define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1))
+/* this is a dummy structure to find out the alignment requirement for a struct
+ * containing all the fundamental data types that are used in ipt_entry,
+ * ip6t_entry and arpt_entry.  This sucks, and it is a hack.  It will be my
+ * personal pleasure to remove it -HW
+ */
+struct _xt_align
+{
+        u_int8_t u8;
+        u_int16_t u16;
+        u_int32_t u32;
+        u_int64_t u64;
+};
+
+#define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1))  \
+                        & ~(__alignof__(struct _xt_align)-1))
 
 /* Standard return verdict, or do jump. */
 #define XT_STANDARD_TARGET ""
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index cee302aefdb7..73b464f0926a 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -26,7 +26,7 @@ struct plat_serial8250_port {
         unsigned char   regshift;       /* register shift */
         unsigned char   iotype;         /* UPIO_* */
         unsigned char   hub6;
-        unsigned int    flags;          /* UPF_* flags */
+        upf_t           flags;          /* UPF_* flags */
 };
 
 /*
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index ec351005bf9d..4041122dabfc 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -203,6 +203,8 @@ struct uart_icount {
         __u32   buf_overrun;
 };
 
+typedef unsigned int __bitwise__ upf_t;
+
 struct uart_port {
         spinlock_t              lock;                   /* port lock */
         unsigned int            iobase;                 /* in/out[bwl] */
@@ -230,36 +232,34 @@ struct uart_port {
         unsigned long           sysrq;                  /* sysrq timeout */
 #endif
 
-        unsigned int            flags;
-
-#define UPF_FOURPORT            (1 << 1)
-#define UPF_SAK                 (1 << 2)
-#define UPF_SPD_MASK            (0x1030)
-#define UPF_SPD_HI              (0x0010)
-#define UPF_SPD_VHI             (0x0020)
-#define UPF_SPD_CUST            (0x0030)
-#define UPF_SPD_SHI             (0x1000)
-#define UPF_SPD_WARP            (0x1010)
-#define UPF_SKIP_TEST           (1 << 6)
-#define UPF_AUTO_IRQ            (1 << 7)
-#define UPF_HARDPPS_CD          (1 << 11)
-#define UPF_LOW_LATENCY         (1 << 13)
-#define UPF_BUGGY_UART          (1 << 14)
-#define UPF_AUTOPROBE           (1 << 15)
-#define UPF_MAGIC_MULTIPLIER    (1 << 16)
-#define UPF_BOOT_ONLYMCA        (1 << 22)
-#define UPF_CONS_FLOW           (1 << 23)
-#define UPF_SHARE_IRQ           (1 << 24)
-#define UPF_BOOT_AUTOCONF       (1 << 28)
-#define UPF_IOREMAP             (1 << 31)
-
-#define UPF_CHANGE_MASK         (0x17fff)
-#define UPF_USR_MASK            (UPF_SPD_MASK|UPF_LOW_LATENCY)
+        upf_t                   flags;
+
+#define UPF_FOURPORT            ((__force upf_t) (1 << 1))
+#define UPF_SAK                 ((__force upf_t) (1 << 2))
+#define UPF_SPD_MASK            ((__force upf_t) (0x1030))
+#define UPF_SPD_HI              ((__force upf_t) (0x0010))
+#define UPF_SPD_VHI             ((__force upf_t) (0x0020))
+#define UPF_SPD_CUST            ((__force upf_t) (0x0030))
+#define UPF_SPD_SHI             ((__force upf_t) (0x1000))
+#define UPF_SPD_WARP            ((__force upf_t) (0x1010))
+#define UPF_SKIP_TEST           ((__force upf_t) (1 << 6))
+#define UPF_AUTO_IRQ            ((__force upf_t) (1 << 7))
+#define UPF_HARDPPS_CD          ((__force upf_t) (1 << 11))
+#define UPF_LOW_LATENCY         ((__force upf_t) (1 << 13))
+#define UPF_BUGGY_UART          ((__force upf_t) (1 << 14))
+#define UPF_MAGIC_MULTIPLIER    ((__force upf_t) (1 << 16))
+#define UPF_CONS_FLOW           ((__force upf_t) (1 << 23))
+#define UPF_SHARE_IRQ           ((__force upf_t) (1 << 24))
+#define UPF_BOOT_AUTOCONF       ((__force upf_t) (1 << 28))
+#define UPF_IOREMAP             ((__force upf_t) (1 << 31))
+
+#define UPF_CHANGE_MASK         ((__force upf_t) (0x17fff))
+#define UPF_USR_MASK            ((__force upf_t) (UPF_SPD_MASK|UPF_LOW_LATENCY))
 
         unsigned int            mctrl;                  /* current modem ctrl settings */
         unsigned int            timeout;                /* character-based timeout */
         unsigned int            type;                   /* port type */
-        struct uart_ops         *ops;
+        const struct uart_ops   *ops;
         unsigned int            custom_divisor;
         unsigned int            line;                   /* port index */
         unsigned long           mapbase;                /* for ioremap */
@@ -289,6 +289,9 @@ struct uart_state {
 };
 
 #define UART_XMIT_SIZE  PAGE_SIZE
+
+typedef unsigned int __bitwise__ uif_t;
+
 /*
  * This is the state information which is only valid when the port
  * is open; it may be freed by the core driver once the device has
@@ -298,17 +301,16 @@ struct uart_state {
 struct uart_info {
         struct tty_struct       *tty;
         struct circ_buf         xmit;
-        unsigned int            flags;
+        uif_t                   flags;
 
 /*
- * These are the flags that specific to info->flags, and reflect our
- * internal state.  They can not be accessed via port->flags.  Low
- * level drivers must not change these, but may query them instead.
+ * Definitions for info->flags.  These are _private_ to serial_core, and
+ * are specific to this structure.  They may be queried by low level drivers.
  */
-#define UIF_CHECK_CD            (1 << 25)
-#define UIF_CTS_FLOW            (1 << 26)
-#define UIF_NORMAL_ACTIVE       (1 << 29)
-#define UIF_INITIALIZED         (1 << 31)
+#define UIF_CHECK_CD            ((__force uif_t) (1 << 25))
+#define UIF_CTS_FLOW            ((__force uif_t) (1 << 26))
+#define UIF_NORMAL_ACTIVE       ((__force uif_t) (1 << 29))
+#define UIF_INITIALIZED         ((__force uif_t) (1 << 31))
 
         int                     blocked_open;
 
@@ -430,7 +432,7 @@ static inline int uart_handle_break(struct uart_port *port)
                 port->sysrq = 0;
         }
 #endif
-        if (info->flags & UPF_SAK)
+        if (port->flags & UPF_SAK)
                 do_SAK(info->tty);
         return 0;
 }