Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 46 insertions, 46 deletions

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 8ba1c320f975..c2731bfe04d8 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -60,7 +60,7 @@ typedef struct sctphdr {
         __be16 source;
         __be16 dest;
         __be32 vtag;
-        __be32 checksum;
+        __le32 checksum;
 } __attribute__((packed)) sctp_sctphdr_t;
 
 #ifdef __KERNEL__
@@ -172,35 +172,35 @@ typedef struct sctp_paramhdr {
 typedef enum {
 
         /* RFC 2960 Section 3.3.5 */
-        SCTP_PARAM_HEARTBEAT_INFO               = __constant_htons(1),
+        SCTP_PARAM_HEARTBEAT_INFO               = cpu_to_be16(1),
         /* RFC 2960 Section 3.3.2.1 */
-        SCTP_PARAM_IPV4_ADDRESS                 = __constant_htons(5),
-        SCTP_PARAM_IPV6_ADDRESS                 = __constant_htons(6),
-        SCTP_PARAM_STATE_COOKIE                 = __constant_htons(7),
-        SCTP_PARAM_UNRECOGNIZED_PARAMETERS      = __constant_htons(8),
-        SCTP_PARAM_COOKIE_PRESERVATIVE          = __constant_htons(9),
-        SCTP_PARAM_HOST_NAME_ADDRESS            = __constant_htons(11),
-        SCTP_PARAM_SUPPORTED_ADDRESS_TYPES      = __constant_htons(12),
-        SCTP_PARAM_ECN_CAPABLE                  = __constant_htons(0x8000),
+        SCTP_PARAM_IPV4_ADDRESS                 = cpu_to_be16(5),
+        SCTP_PARAM_IPV6_ADDRESS                 = cpu_to_be16(6),
+        SCTP_PARAM_STATE_COOKIE                 = cpu_to_be16(7),
+        SCTP_PARAM_UNRECOGNIZED_PARAMETERS      = cpu_to_be16(8),
+        SCTP_PARAM_COOKIE_PRESERVATIVE          = cpu_to_be16(9),
+        SCTP_PARAM_HOST_NAME_ADDRESS            = cpu_to_be16(11),
+        SCTP_PARAM_SUPPORTED_ADDRESS_TYPES      = cpu_to_be16(12),
+        SCTP_PARAM_ECN_CAPABLE                  = cpu_to_be16(0x8000),
 
         /* AUTH Extension Section 3 */
-        SCTP_PARAM_RANDOM                       = __constant_htons(0x8002),
-        SCTP_PARAM_CHUNKS                       = __constant_htons(0x8003),
-        SCTP_PARAM_HMAC_ALGO                    = __constant_htons(0x8004),
+        SCTP_PARAM_RANDOM                       = cpu_to_be16(0x8002),
+        SCTP_PARAM_CHUNKS                       = cpu_to_be16(0x8003),
+        SCTP_PARAM_HMAC_ALGO                    = cpu_to_be16(0x8004),
 
         /* Add-IP: Supported Extensions, Section 4.2 */
-        SCTP_PARAM_SUPPORTED_EXT        = __constant_htons(0x8008),
+        SCTP_PARAM_SUPPORTED_EXT        = cpu_to_be16(0x8008),
 
         /* PR-SCTP Sec 3.1 */
-        SCTP_PARAM_FWD_TSN_SUPPORT      = __constant_htons(0xc000),
+        SCTP_PARAM_FWD_TSN_SUPPORT      = cpu_to_be16(0xc000),
 
         /* Add-IP Extension. Section 3.2 */
-        SCTP_PARAM_ADD_IP               = __constant_htons(0xc001),
-        SCTP_PARAM_DEL_IP               = __constant_htons(0xc002),
-        SCTP_PARAM_ERR_CAUSE            = __constant_htons(0xc003),
-        SCTP_PARAM_SET_PRIMARY          = __constant_htons(0xc004),
-        SCTP_PARAM_SUCCESS_REPORT       = __constant_htons(0xc005),
-        SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),
+        SCTP_PARAM_ADD_IP               = cpu_to_be16(0xc001),
+        SCTP_PARAM_DEL_IP               = cpu_to_be16(0xc002),
+        SCTP_PARAM_ERR_CAUSE            = cpu_to_be16(0xc003),
+        SCTP_PARAM_SET_PRIMARY          = cpu_to_be16(0xc004),
+        SCTP_PARAM_SUCCESS_REPORT       = cpu_to_be16(0xc005),
+        SCTP_PARAM_ADAPTATION_LAYER_IND = cpu_to_be16(0xc006),
 
 } sctp_param_t; /* enum */
 
@@ -212,13 +212,13 @@ typedef enum {
  *
  */
 typedef enum {
-        SCTP_PARAM_ACTION_DISCARD     = __constant_htons(0x0000),
-        SCTP_PARAM_ACTION_DISCARD_ERR = __constant_htons(0x4000),
-        SCTP_PARAM_ACTION_SKIP        = __constant_htons(0x8000),
-        SCTP_PARAM_ACTION_SKIP_ERR    = __constant_htons(0xc000),
+        SCTP_PARAM_ACTION_DISCARD     = cpu_to_be16(0x0000),
+        SCTP_PARAM_ACTION_DISCARD_ERR = cpu_to_be16(0x4000),
+        SCTP_PARAM_ACTION_SKIP        = cpu_to_be16(0x8000),
+        SCTP_PARAM_ACTION_SKIP_ERR    = cpu_to_be16(0xc000),
 } sctp_param_action_t;
 
-enum { SCTP_PARAM_ACTION_MASK = __constant_htons(0xc000), };
+enum { SCTP_PARAM_ACTION_MASK = cpu_to_be16(0xc000), };
 
 /* RFC 2960 Section 3.3.1 Payload Data (DATA) (0) */
 
@@ -457,17 +457,17 @@ typedef struct sctp_operr_chunk {
  */
 typedef enum {
 
-        SCTP_ERROR_NO_ERROR        = __constant_htons(0x00),
-        SCTP_ERROR_INV_STRM        = __constant_htons(0x01),
-        SCTP_ERROR_MISS_PARAM      = __constant_htons(0x02),
-        SCTP_ERROR_STALE_COOKIE    = __constant_htons(0x03),
-        SCTP_ERROR_NO_RESOURCE     = __constant_htons(0x04),
-        SCTP_ERROR_DNS_FAILED      = __constant_htons(0x05),
-        SCTP_ERROR_UNKNOWN_CHUNK   = __constant_htons(0x06),
-        SCTP_ERROR_INV_PARAM       = __constant_htons(0x07),
-        SCTP_ERROR_UNKNOWN_PARAM   = __constant_htons(0x08),
-        SCTP_ERROR_NO_DATA         = __constant_htons(0x09),
-        SCTP_ERROR_COOKIE_IN_SHUTDOWN = __constant_htons(0x0a),
+        SCTP_ERROR_NO_ERROR        = cpu_to_be16(0x00),
+        SCTP_ERROR_INV_STRM        = cpu_to_be16(0x01),
+        SCTP_ERROR_MISS_PARAM      = cpu_to_be16(0x02),
+        SCTP_ERROR_STALE_COOKIE    = cpu_to_be16(0x03),
+        SCTP_ERROR_NO_RESOURCE     = cpu_to_be16(0x04),
+        SCTP_ERROR_DNS_FAILED      = cpu_to_be16(0x05),
+        SCTP_ERROR_UNKNOWN_CHUNK   = cpu_to_be16(0x06),
+        SCTP_ERROR_INV_PARAM       = cpu_to_be16(0x07),
+        SCTP_ERROR_UNKNOWN_PARAM   = cpu_to_be16(0x08),
+        SCTP_ERROR_NO_DATA         = cpu_to_be16(0x09),
+        SCTP_ERROR_COOKIE_IN_SHUTDOWN = cpu_to_be16(0x0a),
 
 
         /* SCTP Implementation Guide:
@@ -476,9 +476,9 @@ typedef enum {
          *  13  Protocol Violation
          */
 
-        SCTP_ERROR_RESTART         = __constant_htons(0x0b),
-        SCTP_ERROR_USER_ABORT      = __constant_htons(0x0c),
-        SCTP_ERROR_PROTO_VIOLATION = __constant_htons(0x0d),
+        SCTP_ERROR_RESTART         = cpu_to_be16(0x0b),
+        SCTP_ERROR_USER_ABORT      = cpu_to_be16(0x0c),
+        SCTP_ERROR_PROTO_VIOLATION = cpu_to_be16(0x0d),
 
         /* ADDIP Section 3.3  New Error Causes
          *
@@ -493,11 +493,11 @@ typedef enum {
          * 0x0103          Association Aborted due to illegal ASCONF-ACK
          * 0x0104          Request refused - no authorization.
          */
-        SCTP_ERROR_DEL_LAST_IP  = __constant_htons(0x0100),
-        SCTP_ERROR_RSRC_LOW     = __constant_htons(0x0101),
-        SCTP_ERROR_DEL_SRC_IP   = __constant_htons(0x0102),
-        SCTP_ERROR_ASCONF_ACK   = __constant_htons(0x0103),
-        SCTP_ERROR_REQ_REFUSED  = __constant_htons(0x0104),
+        SCTP_ERROR_DEL_LAST_IP  = cpu_to_be16(0x0100),
+        SCTP_ERROR_RSRC_LOW     = cpu_to_be16(0x0101),
+        SCTP_ERROR_DEL_SRC_IP   = cpu_to_be16(0x0102),
+        SCTP_ERROR_ASCONF_ACK   = cpu_to_be16(0x0103),
+        SCTP_ERROR_REQ_REFUSED  = cpu_to_be16(0x0104),
 
         /* AUTH Section 4.  New Error Cause
          *
@@ -509,7 +509,7 @@ typedef enum {
          * --------------------------------------------------------------
          * 0x0105          Unsupported HMAC Identifier
          */
-         SCTP_ERROR_UNSUP_HMAC  = __constant_htons(0x0105)
+         SCTP_ERROR_UNSUP_HMAC  = cpu_to_be16(0x0105)
 } sctp_error_t;