134 files changed, 4752 insertions, 2357 deletions
diff --git a/include/linux/8250_pci.h b/include/linux/8250_pci.h
index 5f3ab21b339b..3209dd46ea7d 100644
--- a/include/linux/8250_pci.h
+++ b/include/linux/8250_pci.h
@@ -1,2 +1,37 @@
-int pci_siig10x_fn(struct pci_dev *dev, int enable);
+/*
-int pci_siig20x_fn(struct pci_dev *dev, int enable);
+ * Definitions for PCI support.
+ */
+#define FL_BASE_MASK            0x0007
+#define FL_BASE0                0x0000
+#define FL_BASE1                0x0001
+#define FL_BASE2                0x0002
+#define FL_BASE3                0x0003
+#define FL_BASE4                0x0004
+#define FL_GET_BASE(x)          (x & FL_BASE_MASK)
+/* Use successive BARs (PCI base address registers),
+   else use offset into some specified BAR */
+#define FL_BASE_BARS            0x0008
+/* do not assign an irq */
+#define FL_NOIRQ                0x0080
+/* Use the Base address register size to cap number of ports */
+#define FL_REGION_SZ_CAP        0x0100
+struct pciserial_board {
+        unsigned int flags;
+        unsigned int num_ports;
+        unsigned int base_baud;
+        unsigned int uart_offset;
+        unsigned int reg_shift;
+        unsigned int first_offset;
+};
+struct serial_private;
+struct serial_private *
+pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board);
+void pciserial_remove_ports(struct serial_private *priv);
+void pciserial_suspend_ports(struct serial_private *priv);
+void pciserial_resume_ports(struct serial_private *priv);
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index ef8483673aa3..b46a5205ee7b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -206,7 +206,10 @@ struct acpi_table_plat_int_src {
        u8                      eid;
        u8                      iosapic_vector;
        u32                     global_irq;
-        u32                     reserved;
+        struct {
+                u32                     cpei_override_flag:1;
+                u32                     reserved:31;
+        }                       plint_flags;
 } __attribute__ ((packed));
 enum acpi_interrupt_id {
@@ -450,9 +453,7 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
 * If this matches the last registration, any IRQ resources for gsi
 * are freed.
 */
-#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
 void acpi_unregister_gsi (u32 gsi);
-#endif
 #ifdef CONFIG_ACPI_PCI
@@ -475,11 +476,9 @@ struct acpi_prt_list {
 struct pci_dev;
 int acpi_pci_irq_enable (struct pci_dev *dev);
-void acpi_penalize_isa_irq(int irq);
+void acpi_penalize_isa_irq(int irq, int active);
-#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
 void acpi_pci_irq_disable (struct pci_dev *dev);
-#endif
 struct acpi_pci_driver {
        struct acpi_pci_driver *next;
diff --git a/include/linux/ata.h b/include/linux/ata.h
index ca5fcadf9981..a5b74efab067 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -1,24 +1,29 @@
 /*
-   Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
+ *  Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
-   Copyright 2003-2004 Jeff Garzik
+ *  Copyright 2003-2004 Jeff Garzik
+ *
-   The contents of this file are subject to the Open
+ *
-   Software License version 1.1 that can be found at
+ *  This program is free software; you can redistribute it and/or modify
-   http://www.opensource.org/licenses/osl-1.1.txt and is included herein
+ *  it under the terms of the GNU General Public License as published by
-   by reference.
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
-   Alternatively, the contents of this file may be used under the terms
+ *
-   of the GNU General Public License version 2 (the "GPL") as distributed
+ *  This program is distributed in the hope that it will be useful,
-   in the kernel source COPYING file, in which case the provisions of
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   the GPL are applicable instead of the above.  If you wish to allow
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   the use of your version of this file only under the terms of the
+ *  GNU General Public License for more details.
-   GPL and not to allow others to use your version of this file under
+ *
-   the OSL, indicate your decision by deleting the provisions above and
+ *  You should have received a copy of the GNU General Public License
-   replace them with the notice and other provisions required by the GPL.
+ *  along with this program; see the file COPYING.  If not, write to
-   If you do not delete the provisions above, a recipient may use your
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-   version of this file under either the OSL or the GPL.
+ *
+ *
+ *  libata documentation is available via 'make {ps|pdf}docs',
+ *  as Documentation/DocBook/libata.*
+ *
+ *  Hardware documentation available from http://www.t13.org/
+ *
 */
 #ifndef __LINUX_ATA_H__
@@ -108,6 +113,8 @@ enum {
        /* ATA device commands */
        ATA_CMD_CHK_POWER       = 0xE5, /* check power mode */
+        ATA_CMD_STANDBY         = 0xE2, /* place in standby power mode */
+        ATA_CMD_IDLE            = 0xE3, /* place in idle power mode */
        ATA_CMD_EDD             = 0x90, /* execute device diagnostic */
        ATA_CMD_FLUSH           = 0xE7,
        ATA_CMD_FLUSH_EXT       = 0xEA,
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0881b5cdee3d..19bd8e7e11bf 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -301,6 +301,7 @@ struct blk_queue_tag {
        struct list_head busy_list;     /* fifo list of busy tags */
        int busy;                       /* current depth */
        int max_depth;                  /* what we will send to device */
+        int real_max_depth;             /* what the array can hold */
        atomic_t refcnt;                /* map can be shared */
 };
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 8d139f4acf23..6b4618902d3d 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -233,6 +233,7 @@ typedef __u32 kernel_cap_t;
 /* Allow enabling/disabling tagged queuing on SCSI controllers and sending
   arbitrary SCSI commands */
 /* Allow setting encryption key on loopback filesystem */
+/* Allow setting zone reclaim policy */
 #define CAP_SYS_ADMIN        21
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index e8904c0da686..86980c68234a 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -8,7 +8,7 @@
 * Basic handling of the devices is done in drivers/base/cpu.c
 * and system devices are handled in drivers/base/sys.c. 
 *
- * CPUs are exported via driverfs in the class/cpu/devices/
+ * CPUs are exported via sysfs in the class/cpu/devices/
 * directory. 
 *
 * Per-cpu interfaces can be implemented using a struct device_interface. 
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 5e2bcc636a02..3c89df6e7768 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -45,6 +45,7 @@
 #define CRYPTO_TFM_MODE_CTR             0x00000008
 #define CRYPTO_TFM_REQ_WEAK_KEY         0x00000100
+#define CRYPTO_TFM_REQ_MAY_SLEEP        0x00000200
 #define CRYPTO_TFM_RES_WEAK_KEY         0x00100000
 #define CRYPTO_TFM_RES_BAD_KEY_LEN      0x00200000
 #define CRYPTO_TFM_RES_BAD_KEY_SCHED    0x00400000
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
new file mode 100644
index 000000000000..007c290f74d4
--- /dev/null
+++ b/include/linux/dccp.h
@@ -0,0 +1,456 @@
+#ifndef _LINUX_DCCP_H
+#define _LINUX_DCCP_H
+#include <linux/types.h>
+#include <asm/byteorder.h>
+/* Structure describing an Internet (DCCP) socket address. */
+struct sockaddr_dccp {
+        __u16   sdccp_family;   /* Address family   */
+        __u16   sdccp_port;     /* Port number      */
+        __u32   sdccp_addr;     /* Internet address */
+        __u32   sdccp_service;  /* Service          */
+        /* Pad to size of `struct sockaddr': 16 bytes . */
+        __u32   sdccp_pad;
+};
+/**
+ * struct dccp_hdr - generic part of DCCP packet header
+ *
+ * @dccph_sport - Relevant port on the endpoint that sent this packet
+ * @dccph_dport - Relevant port on the other endpoint
+ * @dccph_doff - Data Offset from the start of the DCCP header, in 32-bit words
+ * @dccph_ccval - Used by the HC-Sender CCID
+ * @dccph_cscov - Parts of the packet that are covered by the Checksum field
+ * @dccph_checksum - Internet checksum, depends on dccph_cscov
+ * @dccph_x - 0 = 24 bit sequence number, 1 = 48
+ * @dccph_type - packet type, see DCCP_PKT_ prefixed macros
+ * @dccph_seq - sequence number high or low order 24 bits, depends on dccph_x
+ */
+struct dccp_hdr {
+        __u16   dccph_sport,
+                dccph_dport;
+        __u8    dccph_doff;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8    dccph_cscov:4,
+                dccph_ccval:4;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u8    dccph_ccval:4,
+                dccph_cscov:4;
+#else
+#error  "Adjust your <asm/byteorder.h> defines"
+#endif
+        __u16   dccph_checksum;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u32   dccph_x:1,
+                dccph_type:4,
+                dccph_reserved:3,
+                dccph_seq:24;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u32   dccph_reserved:3,
+                dccph_type:4,
+                dccph_x:1,
+                dccph_seq:24;
+#else
+#error  "Adjust your <asm/byteorder.h> defines"
+#endif
+};
+/**
+ * struct dccp_hdr_ext - the low bits of a 48 bit seq packet
+ *
+ * @dccph_seq_low - low 24 bits of a 48 bit seq packet
+ */
+struct dccp_hdr_ext {
+        __u32   dccph_seq_low;
+};
+/**
+ * struct dccp_hdr_request - Conection initiation request header
+ *
+ * @dccph_req_service - Service to which the client app wants to connect
+ * @dccph_req_options - list of options (must be a multiple of 32 bits
+ */
+struct dccp_hdr_request {
+        __u32   dccph_req_service;
+};
+/**
+ * struct dccp_hdr_ack_bits - acknowledgment bits common to most packets
+ *
+ * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
+ * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
+ */
+struct dccp_hdr_ack_bits {
+        __u32   dccph_reserved1:8,
+                dccph_ack_nr_high:24;
+        __u32   dccph_ack_nr_low;
+};
+/**
+ * struct dccp_hdr_response - Conection initiation response header
+ *
+ * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
+ * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
+ * @dccph_resp_service - Echoes the Service Code on a received DCCP-Request
+ * @dccph_resp_options - list of options (must be a multiple of 32 bits
+ */
+struct dccp_hdr_response {
+        struct dccp_hdr_ack_bits        dccph_resp_ack;
+        __u32                           dccph_resp_service;
+};
+/**
+ * struct dccp_hdr_reset - Unconditionally shut down a connection
+ *
+ * @dccph_reset_service - Echoes the Service Code on a received DCCP-Request
+ * @dccph_reset_options - list of options (must be a multiple of 32 bits
+ */
+struct dccp_hdr_reset {
+        struct dccp_hdr_ack_bits        dccph_reset_ack;
+        __u8                            dccph_reset_code,
+                                        dccph_reset_data[3];
+};
+enum dccp_pkt_type {
+        DCCP_PKT_REQUEST = 0,
+        DCCP_PKT_RESPONSE,
+        DCCP_PKT_DATA,
+        DCCP_PKT_ACK,
+        DCCP_PKT_DATAACK,
+        DCCP_PKT_CLOSEREQ,
+        DCCP_PKT_CLOSE,
+        DCCP_PKT_RESET,
+        DCCP_PKT_SYNC,
+        DCCP_PKT_SYNCACK,
+        DCCP_PKT_INVALID,
+};
+#define DCCP_NR_PKT_TYPES DCCP_PKT_INVALID
+static inline unsigned int dccp_packet_hdr_len(const __u8 type)
+{
+        if (type == DCCP_PKT_DATA)
+                return 0;
+        if (type == DCCP_PKT_DATAACK    ||
+            type == DCCP_PKT_ACK        ||
+            type == DCCP_PKT_SYNC       ||
+            type == DCCP_PKT_SYNCACK    ||
+            type == DCCP_PKT_CLOSE      ||
+            type == DCCP_PKT_CLOSEREQ)
+                return sizeof(struct dccp_hdr_ack_bits);
+        if (type == DCCP_PKT_REQUEST)
+                return sizeof(struct dccp_hdr_request);
+        if (type == DCCP_PKT_RESPONSE)
+                return sizeof(struct dccp_hdr_response);
+        return sizeof(struct dccp_hdr_reset);
+}
+enum dccp_reset_codes {
+        DCCP_RESET_CODE_UNSPECIFIED = 0,
+        DCCP_RESET_CODE_CLOSED,
+        DCCP_RESET_CODE_ABORTED,
+        DCCP_RESET_CODE_NO_CONNECTION,
+        DCCP_RESET_CODE_PACKET_ERROR,
+        DCCP_RESET_CODE_OPTION_ERROR,
+        DCCP_RESET_CODE_MANDATORY_ERROR,
+        DCCP_RESET_CODE_CONNECTION_REFUSED,
+        DCCP_RESET_CODE_BAD_SERVICE_CODE,
+        DCCP_RESET_CODE_TOO_BUSY,
+        DCCP_RESET_CODE_BAD_INIT_COOKIE,
+        DCCP_RESET_CODE_AGGRESSION_PENALTY,
+};
+/* DCCP options */
+enum {
+        DCCPO_PADDING = 0,
+        DCCPO_MANDATORY = 1,
+        DCCPO_MIN_RESERVED = 3,
+        DCCPO_MAX_RESERVED = 31,
+        DCCPO_NDP_COUNT = 37,
+        DCCPO_ACK_VECTOR_0 = 38,
+        DCCPO_ACK_VECTOR_1 = 39,
+        DCCPO_TIMESTAMP = 41,
+        DCCPO_TIMESTAMP_ECHO = 42,
+        DCCPO_ELAPSED_TIME = 43,
+        DCCPO_MAX = 45,
+        DCCPO_MIN_CCID_SPECIFIC = 128,
+        DCCPO_MAX_CCID_SPECIFIC = 255,
+};
+/* DCCP features */
+enum {
+        DCCPF_RESERVED = 0,
+        DCCPF_SEQUENCE_WINDOW = 3,
+        DCCPF_SEND_ACK_VECTOR = 6,
+        DCCPF_SEND_NDP_COUNT = 7,
+        /* 10-127 reserved */
+        DCCPF_MIN_CCID_SPECIFIC = 128,
+        DCCPF_MAX_CCID_SPECIFIC = 255,
+};
+/* DCCP socket options */
+#define DCCP_SOCKOPT_PACKET_SIZE        1
+#ifdef __KERNEL__
+#include <linux/in.h>
+#include <linux/list.h>
+#include <linux/uio.h>
+#include <linux/workqueue.h>
+#include <net/inet_connection_sock.h>
+#include <net/inet_timewait_sock.h>
+#include <net/sock.h>
+#include <net/tcp_states.h>
+#include <net/tcp.h>
+enum dccp_state {
+        DCCP_OPEN       = TCP_ESTABLISHED,
+        DCCP_REQUESTING = TCP_SYN_SENT,
+        DCCP_PARTOPEN   = TCP_FIN_WAIT1, /* FIXME:
+                                            This mapping is horrible, but TCP has
+                                            no matching state for DCCP_PARTOPEN,
+                                            as TCP_SYN_RECV is already used by
+                                            DCCP_RESPOND, why don't stop using TCP
+                                            mapping of states? OK, now we don't use
+                                            sk_stream_sendmsg anymore, so doesn't
+                                            seem to exist any reason for us to
+                                            do the TCP mapping here */
+        DCCP_LISTEN     = TCP_LISTEN,
+        DCCP_RESPOND    = TCP_SYN_RECV,
+        DCCP_CLOSING    = TCP_CLOSING,
+        DCCP_TIME_WAIT  = TCP_TIME_WAIT,
+        DCCP_CLOSED     = TCP_CLOSE,
+        DCCP_MAX_STATES = TCP_MAX_STATES,
+};
+#define DCCP_STATE_MASK 0xf
+#define DCCP_ACTION_FIN (1<<7)
+enum {
+        DCCPF_OPEN       = TCPF_ESTABLISHED,
+        DCCPF_REQUESTING = TCPF_SYN_SENT,
+        DCCPF_PARTOPEN   = TCPF_FIN_WAIT1,
+        DCCPF_LISTEN     = TCPF_LISTEN,
+        DCCPF_RESPOND    = TCPF_SYN_RECV,
+        DCCPF_CLOSING    = TCPF_CLOSING,
+        DCCPF_TIME_WAIT  = TCPF_TIME_WAIT,
+        DCCPF_CLOSED     = TCPF_CLOSE,
+};
+static inline struct dccp_hdr *dccp_hdr(const struct sk_buff *skb)
+{
+        return (struct dccp_hdr *)skb->h.raw;
+}
+static inline struct dccp_hdr_ext *dccp_hdrx(const struct sk_buff *skb)
+{
+        return (struct dccp_hdr_ext *)(skb->h.raw + sizeof(struct dccp_hdr));
+}
+static inline unsigned int __dccp_basic_hdr_len(const struct dccp_hdr *dh)
+{
+        return sizeof(*dh) + (dh->dccph_x ? sizeof(struct dccp_hdr_ext) : 0);
+}
+static inline unsigned int dccp_basic_hdr_len(const struct sk_buff *skb)
+{
+        const struct dccp_hdr *dh = dccp_hdr(skb);
+        return __dccp_basic_hdr_len(dh);
+}
+static inline __u64 dccp_hdr_seq(const struct sk_buff *skb)
+{
+        const struct dccp_hdr *dh = dccp_hdr(skb);
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u64 seq_nr = ntohl(dh->dccph_seq << 8);
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u64 seq_nr = ntohl(dh->dccph_seq);
+#else
+#error  "Adjust your <asm/byteorder.h> defines"
+#endif
+        if (dh->dccph_x != 0)
+                seq_nr = (seq_nr << 32) + ntohl(dccp_hdrx(skb)->dccph_seq_low);
+        return seq_nr;
+}
+static inline struct dccp_hdr_request *dccp_hdr_request(struct sk_buff *skb)
+{
+        return (struct dccp_hdr_request *)(skb->h.raw + dccp_basic_hdr_len(skb));
+}
+static inline struct dccp_hdr_ack_bits *dccp_hdr_ack_bits(const struct sk_buff *skb)
+{
+        return (struct dccp_hdr_ack_bits *)(skb->h.raw + dccp_basic_hdr_len(skb));
+}
+static inline u64 dccp_hdr_ack_seq(const struct sk_buff *skb)
+{
+        const struct dccp_hdr_ack_bits *dhack = dccp_hdr_ack_bits(skb);
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        return (((u64)ntohl(dhack->dccph_ack_nr_high << 8)) << 32) + ntohl(dhack->dccph_ack_nr_low);
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        return (((u64)ntohl(dhack->dccph_ack_nr_high)) << 32) + ntohl(dhack->dccph_ack_nr_low);
+#else
+#error  "Adjust your <asm/byteorder.h> defines"
+#endif
+}
+static inline struct dccp_hdr_response *dccp_hdr_response(struct sk_buff *skb)
+{
+        return (struct dccp_hdr_response *)(skb->h.raw + dccp_basic_hdr_len(skb));
+}
+static inline struct dccp_hdr_reset *dccp_hdr_reset(struct sk_buff *skb)
+{
+        return (struct dccp_hdr_reset *)(skb->h.raw + dccp_basic_hdr_len(skb));
+}
+static inline unsigned int __dccp_hdr_len(const struct dccp_hdr *dh)
+{
+        return __dccp_basic_hdr_len(dh) +
+               dccp_packet_hdr_len(dh->dccph_type);
+}
+static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
+{
+        return __dccp_hdr_len(dccp_hdr(skb));
+}
+/* initial values for each feature */
+#define DCCPF_INITIAL_SEQUENCE_WINDOW           100
+/* FIXME: for now we're using CCID 3 (TFRC) */
+#define DCCPF_INITIAL_CCID                      3
+#define DCCPF_INITIAL_SEND_ACK_VECTOR           0
+/* FIXME: for now we're default to 1 but it should really be 0 */
+#define DCCPF_INITIAL_SEND_NDP_COUNT            1
+#define DCCP_NDP_LIMIT 0xFFFFFF
+/**
+  * struct dccp_options - option values for a DCCP connection
+  *     @dccpo_sequence_window - Sequence Window Feature (section 7.5.2)
+  *     @dccpo_ccid - Congestion Control Id (CCID) (section 10)
+  *     @dccpo_send_ack_vector - Send Ack Vector Feature (section 11.5)
+  *     @dccpo_send_ndp_count - Send NDP Count Feature (7.7.2)
+  */
+struct dccp_options {
+        __u64   dccpo_sequence_window;
+        __u8    dccpo_ccid;
+        __u8    dccpo_send_ack_vector;
+        __u8    dccpo_send_ndp_count;
+};
+extern void __dccp_options_init(struct dccp_options *dccpo);
+extern void dccp_options_init(struct dccp_options *dccpo);
+extern int dccp_parse_options(struct sock *sk, struct sk_buff *skb);
+struct dccp_request_sock {
+        struct inet_request_sock dreq_inet_rsk;
+        __u64                    dreq_iss;
+        __u64                    dreq_isr;
+        __u32                    dreq_service;
+};
+static inline struct dccp_request_sock *dccp_rsk(const struct request_sock *req)
+{
+        return (struct dccp_request_sock *)req;
+}
+extern struct inet_timewait_death_row dccp_death_row;
+/* Read about the ECN nonce to see why it is 253 */
+#define DCCP_MAX_ACK_VECTOR_LEN 253
+struct dccp_options_received {
+        u32     dccpor_ndp:24,
+                dccpor_ack_vector_len:8;
+        u32     dccpor_ack_vector_idx:10;
+        /* 22 bits hole, try to pack */
+        u32     dccpor_timestamp;
+        u32     dccpor_timestamp_echo;
+        u32     dccpor_elapsed_time;
+};
+struct ccid;
+enum dccp_role {
+        DCCP_ROLE_UNDEFINED,
+        DCCP_ROLE_LISTEN,
+        DCCP_ROLE_CLIENT,
+        DCCP_ROLE_SERVER,
+};
+/**
+ * struct dccp_sock - DCCP socket state
+ *
+ * @dccps_swl - sequence number window low
+ * @dccps_swh - sequence number window high
+ * @dccps_awl - acknowledgement number window low
+ * @dccps_awh - acknowledgement number window high
+ * @dccps_iss - initial sequence number sent
+ * @dccps_isr - initial sequence number received
+ * @dccps_osr - first OPEN sequence number received
+ * @dccps_gss - greatest sequence number sent
+ * @dccps_gsr - greatest valid sequence number received
+ * @dccps_gar - greatest valid ack number received on a non-Sync; initialized to %dccps_iss
+ * @dccps_timestamp_time - time of latest TIMESTAMP option
+ * @dccps_timestamp_echo - latest timestamp received on a TIMESTAMP option
+ * @dccps_ext_header_len - network protocol overhead (IP/IPv6 options)
+ * @dccps_pmtu_cookie - Last pmtu seen by socket
+ * @dccps_packet_size - Set thru setsockopt
+ * @dccps_role - Role of this sock, one of %dccp_role
+ * @dccps_ndp_count - number of Non Data Packets since last data packet
+ * @dccps_hc_rx_ackpkts - receiver half connection acked packets
+ */
+struct dccp_sock {
+        /* inet_connection_sock has to be the first member of dccp_sock */
+        struct inet_connection_sock     dccps_inet_connection;
+        __u64                           dccps_swl;
+        __u64                           dccps_swh;
+        __u64                           dccps_awl;
+        __u64                           dccps_awh;
+        __u64                           dccps_iss;
+        __u64                           dccps_isr;
+        __u64                           dccps_osr;
+        __u64                           dccps_gss;
+        __u64                           dccps_gsr;
+        __u64                           dccps_gar;
+        unsigned long                   dccps_service;
+        struct timeval                  dccps_timestamp_time;
+        __u32                           dccps_timestamp_echo;
+        __u32                           dccps_packet_size;
+        unsigned long                   dccps_ndp_count;
+        __u16                           dccps_ext_header_len;
+        __u32                           dccps_pmtu_cookie;
+        __u32                           dccps_mss_cache;
+        struct dccp_options             dccps_options;
+        struct dccp_ackpkts             *dccps_hc_rx_ackpkts;
+        void                            *dccps_hc_rx_ccid_private;
+        void                            *dccps_hc_tx_ccid_private;
+        struct ccid                     *dccps_hc_rx_ccid;
+        struct ccid                     *dccps_hc_tx_ccid;
+        struct dccp_options_received    dccps_options_received;
+        enum dccp_role                  dccps_role:2;
+};
+ 
+static inline struct dccp_sock *dccp_sk(const struct sock *sk)
+{
+        return (struct dccp_sock *)sk;
+}
+static inline const char *dccp_role(const struct sock *sk)
+{
+        switch (dccp_sk(sk)->dccps_role) {
+        case DCCP_ROLE_UNDEFINED: return "undefined";
+        case DCCP_ROLE_LISTEN:    return "listen";
+        case DCCP_ROLE_SERVER:    return "server";
+        case DCCP_ROLE_CLIENT:    return "client";
+        }
+        return NULL;
+}
+#endif /* __KERNEL__ */
+#endif /* _LINUX_DCCP_H */
diff --git a/include/linux/dcookies.h b/include/linux/dcookies.h
index c28050136164..1d68428c925d 100644
--- a/include/linux/dcookies.h
+++ b/include/linux/dcookies.h
@@ -48,12 +48,12 @@ int get_dcookie(struct dentry * dentry, struct vfsmount * vfsmnt,
 #else
-struct dcookie_user * dcookie_register(void)
+static inline struct dcookie_user * dcookie_register(void)
 {
        return NULL;
 }
-void dcookie_unregister(struct dcookie_user * user)
+static inline void dcookie_unregister(struct dcookie_user * user)
 {
        return;
 }
diff --git a/include/linux/device.h b/include/linux/device.h
index f378c846e6d5..06e5d42f2c7b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -284,8 +284,10 @@ struct device {
        struct device_driver *driver;   /* which driver has allocated this
                                           device */
        void            *driver_data;   /* data private to the driver */
-        void            *platform_data; /* Platform specific data (e.g. ACPI,
+        void            *platform_data; /* Platform specific data, device
-                                           BIOS data relevant to device) */
+                                           core doesn't touch it */
+        void            *firmware_data; /* Firmware specific data (e.g. ACPI,
+                                           BIOS data),reserved for device core*/
        struct dev_pm_info      power;
        u64             *dma_mask;      /* dma mask (if dma'able device) */
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 73781ec165b4..c7c5dd316182 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -91,11 +91,6 @@ typedef	struct {
 #define EFI_PAGE_SHIFT          12
-/*
- * For current x86 implementations of EFI, there is
- * additional padding in the mem descriptors.  This is not
- * the case in ia64.  Need to have this fixed in the f/w.
- */
 typedef struct {
        u32 type;
        u32 pad;
@@ -103,9 +98,6 @@ typedef struct {
        u64 virt_addr;
        u64 num_pages;
        u64 attribute;
-#if defined (__i386__)
-        u64 pad1;
-#endif
 } efi_memory_desc_t;
 typedef int (*efi_freemem_callback_t) (unsigned long start, unsigned long end, void *arg);
@@ -240,10 +232,12 @@ typedef struct {
 } efi_system_table_t;
 struct efi_memory_map {
-        efi_memory_desc_t *phys_map;
+        void *phys_map;
-        efi_memory_desc_t *map;
+        void *map;
+        void *map_end;
        int nr_map;
        unsigned long desc_version;
+        unsigned long desc_size;
 };
 /*
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index cf3847edc50f..4522c7186bf3 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -33,7 +33,7 @@ extern int		eth_header(struct sk_buff *skb, struct net_device *dev,
                                   unsigned short type, void *daddr,
                                   void *saddr, unsigned len);
 extern int              eth_rebuild_header(struct sk_buff *skb);
-extern unsigned short   eth_type_trans(struct sk_buff *skb, struct net_device *dev);
+extern __be16           eth_type_trans(struct sk_buff *skb, struct net_device *dev);
 extern void             eth_header_cache_update(struct hh_cache *hh, struct net_device *dev,
                                                unsigned char * haddr);
 extern int              eth_header_cache(struct neighbour *neigh,
@@ -69,6 +69,12 @@ static inline int is_multicast_ether_addr(const u8 *addr)
        return ((addr[0] != 0xff) && (0x01 & addr[0]));
 }
+static inline int is_broadcast_ether_addr(const u8 *addr)
+{
+        return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&  
+                (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+}
 /**
 * is_valid_ether_addr - Determine if the given Ethernet address is valid
 * @addr: Pointer to a six-byte array containing the Ethernet address
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index a0ab26aab450..ed1440ea4c91 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -250,6 +250,12 @@ struct ethtool_stats {
        u64     data[0];
 };
+struct ethtool_perm_addr {
+        u32     cmd;            /* ETHTOOL_GPERMADDR */
+        u32     size;
+        u8      data[0];
+};
 struct net_device;
 /* Some generic methods drivers may use in their ethtool_ops */
@@ -261,6 +267,8 @@ u32 ethtool_op_get_sg(struct net_device *dev);
 int ethtool_op_set_sg(struct net_device *dev, u32 data);
 u32 ethtool_op_get_tso(struct net_device *dev);
 int ethtool_op_set_tso(struct net_device *dev, u32 data);
+int ethtool_op_get_perm_addr(struct net_device *dev, 
+                             struct ethtool_perm_addr *addr, u8 *data);
 /**
 * &ethtool_ops - Alter and report network device settings
@@ -294,7 +302,8 @@ int ethtool_op_set_tso(struct net_device *dev, u32 data);
 * get_strings: Return a set of strings that describe the requested objects 
 * phys_id: Identify the device
 * get_stats: Return statistics about the device
- *
+ * get_perm_addr: Gets the permanent hardware address
+ * 
 * Description:
 *
 * get_settings:
@@ -352,6 +361,7 @@ struct ethtool_ops {
        int     (*phys_id)(struct net_device *, u32);
        int     (*get_stats_count)(struct net_device *);
        void    (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
+        int     (*get_perm_addr)(struct net_device *, struct ethtool_perm_addr *, u8 *);
        int     (*begin)(struct net_device *);
        void    (*complete)(struct net_device *);
 };
@@ -389,6 +399,7 @@ struct ethtool_ops {
 #define ETHTOOL_GSTATS          0x0000001d /* get NIC-specific statistics */
 #define ETHTOOL_GTSO            0x0000001e /* Get TSO enable (ethtool_value) */
 #define ETHTOOL_STSO            0x0000001f /* Set TSO enable (ethtool_value) */
+#define ETHTOOL_GPERMADDR       0x00000020 /* Get permanent hardware address */
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -408,6 +419,8 @@ struct ethtool_ops {
 #define SUPPORTED_FIBRE                 (1 << 10)
 #define SUPPORTED_BNC                   (1 << 11)
 #define SUPPORTED_10000baseT_Full       (1 << 12)
+#define SUPPORTED_Pause                 (1 << 13)
+#define SUPPORTED_Asym_Pause            (1 << 14)
 /* Indicates what features are advertised by the interface. */
 #define ADVERTISED_10baseT_Half         (1 << 0)
@@ -423,6 +436,8 @@ struct ethtool_ops {
 #define ADVERTISED_FIBRE                (1 << 10)
 #define ADVERTISED_BNC                  (1 << 11)
 #define ADVERTISED_10000baseT_Full      (1 << 12)
+#define ADVERTISED_Pause                (1 << 13)
+#define ADVERTISED_Asym_Pause           (1 << 14)
 /* The following are all involved in forcing a particular link
 * mode for the device for setting things.  When getting the
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 4b6e1ab216a5..c16662836c58 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -239,6 +239,20 @@ struct ext3_new_group_data {
 #define EXT3_IOC_SETRSVSZ               _IOW('f', 6, long)
 /*
+ *  Mount options
+ */
+struct ext3_mount_options {
+        unsigned long s_mount_opt;
+        uid_t s_resuid;
+        gid_t s_resgid;
+        unsigned long s_commit_interval;
+#ifdef CONFIG_QUOTA
+        int s_jquota_fmt;
+        char *s_qf_names[MAXQUOTAS];
+#endif
+};
+/*
 * Structure of an inode on the disk
 */
 struct ext3_inode {
diff --git a/include/linux/fadvise.h b/include/linux/fadvise.h
index 6fc656dfb93d..e8e747139b9a 100644
--- a/include/linux/fadvise.h
+++ b/include/linux/fadvise.h
@@ -5,7 +5,17 @@
 #define POSIX_FADV_RANDOM       1 /* Expect random page references.  */
 #define POSIX_FADV_SEQUENTIAL   2 /* Expect sequential page references.  */
 #define POSIX_FADV_WILLNEED     3 /* Will need these pages.  */
+/*
+ * The advise values for POSIX_FADV_DONTNEED and POSIX_ADV_NOREUSE
+ * for s390-64 differ from the values for the rest of the world.
+ */
+#if defined(__s390x__)
+#define POSIX_FADV_DONTNEED     6 /* Don't need these pages.  */
+#define POSIX_FADV_NOREUSE      7 /* Data will be accessed once.  */
+#else
 #define POSIX_FADV_DONTNEED     4 /* Don't need these pages.  */
 #define POSIX_FADV_NOREUSE      5 /* Data will be accessed once.  */
+#endif
 #endif  /* FADVISE_H_INCLUDED */
diff --git a/include/linux/fddidevice.h b/include/linux/fddidevice.h
index 002f6367697d..e61e42dfd317 100644
--- a/include/linux/fddidevice.h
+++ b/include/linux/fddidevice.h
@@ -25,7 +25,7 @@
 #include <linux/if_fddi.h>
 #ifdef __KERNEL__
-extern unsigned short   fddi_type_trans(struct sk_buff *skb,
+extern __be16   fddi_type_trans(struct sk_buff *skb,
                                struct net_device *dev);
 extern struct net_device *alloc_fddidev(int sizeof_priv);
 #endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 302ec20838ca..67e6732d4fdc 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -474,6 +474,11 @@ struct inode {
        struct dnotify_struct   *i_dnotify; /* for directory notifications */
 #endif
+#ifdef CONFIG_INOTIFY
+        struct list_head        inotify_watches; /* watches on this inode */
+        struct semaphore        inotify_sem;    /* protects the watches list */
+#endif
        unsigned long           i_state;
        unsigned long           dirtied_when;   /* jiffies of first dirtying */
@@ -692,11 +697,13 @@ extern struct list_head file_lock_list;
 #include <linux/fcntl.h>
 extern int fcntl_getlk(struct file *, struct flock __user *);
-extern int fcntl_setlk(struct file *, unsigned int, struct flock __user *);
+extern int fcntl_setlk(unsigned int, struct file *, unsigned int,
+                        struct flock __user *);
 #if BITS_PER_LONG == 32
 extern int fcntl_getlk64(struct file *, struct flock64 __user *);
-extern int fcntl_setlk64(struct file *, unsigned int, struct flock64 __user *);
+extern int fcntl_setlk64(unsigned int, struct file *, unsigned int,
+                        struct flock64 __user *);
 #endif
 extern void send_sigio(struct fown_struct *fown, int fd, int band);
@@ -986,8 +993,8 @@ struct inode_operations {
        int (*rename) (struct inode *, struct dentry *,
                        struct inode *, struct dentry *);
        int (*readlink) (struct dentry *, char __user *,int);
-        int (*follow_link) (struct dentry *, struct nameidata *);
+        void * (*follow_link) (struct dentry *, struct nameidata *);
-        void (*put_link) (struct dentry *, struct nameidata *);
+        void (*put_link) (struct dentry *, struct nameidata *, void *);
        void (*truncate) (struct inode *);
        int (*permission) (struct inode *, int, struct nameidata *);
        int (*setattr) (struct dentry *, struct iattr *);
@@ -1393,7 +1400,6 @@ extern void emergency_remount(void);
 extern int do_remount_sb(struct super_block *sb, int flags,
                         void *data, int force);
 extern sector_t bmap(struct inode *, sector_t);
-extern int setattr_mask(unsigned int);
 extern int notify_change(struct dentry *, struct iattr *);
 extern int permission(struct inode *, int, struct nameidata *);
 extern int generic_permission(struct inode *, int,
@@ -1437,6 +1443,9 @@ extern int inode_needs_sync(struct inode *inode);
 extern void generic_delete_inode(struct inode *inode);
 extern void generic_drop_inode(struct inode *inode);
+extern struct inode *ilookup5_nowait(struct super_block *sb,
+                unsigned long hashval, int (*test)(struct inode *, void *),
+                void *data);
 extern struct inode *ilookup5(struct super_block *sb, unsigned long hashval,
                int (*test)(struct inode *, void *), void *data);
 extern struct inode *ilookup(struct super_block *sb, unsigned long ino);
@@ -1593,8 +1602,8 @@ extern struct file_operations generic_ro_fops;
 extern int vfs_readlink(struct dentry *, char __user *, int, const char *);
 extern int vfs_follow_link(struct nameidata *, const char *);
 extern int page_readlink(struct dentry *, char __user *, int);
-extern int page_follow_link_light(struct dentry *, struct nameidata *);
+extern void *page_follow_link_light(struct dentry *, struct nameidata *);
-extern void page_put_link(struct dentry *, struct nameidata *);
+extern void page_put_link(struct dentry *, struct nameidata *, void *);
 extern int page_symlink(struct inode *inode, const char *symname, int len);
 extern struct inode_operations page_symlink_inode_operations;
 extern int generic_readlink(struct dentry *, char __user *, int);
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
new file mode 100644
index 000000000000..03b8e7932b83
--- /dev/null
+++ b/include/linux/fsnotify.h
@@ -0,0 +1,251 @@
+#ifndef _LINUX_FS_NOTIFY_H
+#define _LINUX_FS_NOTIFY_H
+/*
+ * include/linux/fsnotify.h - generic hooks for filesystem notification, to
+ * reduce in-source duplication from both dnotify and inotify.
+ *
+ * We don't compile any of this away in some complicated menagerie of ifdefs.
+ * Instead, we rely on the code inside to optimize away as needed.
+ *
+ * (C) Copyright 2005 Robert Love
+ */
+#ifdef __KERNEL__
+#include <linux/dnotify.h>
+#include <linux/inotify.h>
+/*
+ * fsnotify_move - file old_name at old_dir was moved to new_name at new_dir
+ */
+static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
+                                 const char *old_name, const char *new_name,
+                                 int isdir, struct inode *target, struct inode *source)
+{
+        u32 cookie = inotify_get_cookie();
+        if (old_dir == new_dir)
+                inode_dir_notify(old_dir, DN_RENAME);
+        else {
+                inode_dir_notify(old_dir, DN_DELETE);
+                inode_dir_notify(new_dir, DN_CREATE);
+        }
+        if (isdir)
+                isdir = IN_ISDIR;
+        inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name);
+        inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name);
+        if (target) {
+                inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL);
+                inotify_inode_is_dead(target);
+        }
+        if (source) {
+                inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL);
+        }
+}
+/*
+ * fsnotify_nameremove - a filename was removed from a directory
+ */
+static inline void fsnotify_nameremove(struct dentry *dentry, int isdir)
+{
+        if (isdir)
+                isdir = IN_ISDIR;
+        dnotify_parent(dentry, DN_DELETE);
+        inotify_dentry_parent_queue_event(dentry, IN_DELETE|isdir, 0, dentry->d_name.name);
+}
+/*
+ * fsnotify_inoderemove - an inode is going away
+ */
+static inline void fsnotify_inoderemove(struct inode *inode)
+{
+        inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL);
+        inotify_inode_is_dead(inode);
+}
+/*
+ * fsnotify_create - 'name' was linked in
+ */
+static inline void fsnotify_create(struct inode *inode, const char *name)
+{
+        inode_dir_notify(inode, DN_CREATE);
+        inotify_inode_queue_event(inode, IN_CREATE, 0, name);
+}
+/*
+ * fsnotify_mkdir - directory 'name' was created
+ */
+static inline void fsnotify_mkdir(struct inode *inode, const char *name)
+{
+        inode_dir_notify(inode, DN_CREATE);
+        inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, name);
+}
+/*
+ * fsnotify_access - file was read
+ */
+static inline void fsnotify_access(struct dentry *dentry)
+{
+        struct inode *inode = dentry->d_inode;
+        u32 mask = IN_ACCESS;
+        if (S_ISDIR(inode->i_mode))
+                mask |= IN_ISDIR;
+        dnotify_parent(dentry, DN_ACCESS);
+        inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
+        inotify_inode_queue_event(inode, mask, 0, NULL);
+}
+/*
+ * fsnotify_modify - file was modified
+ */
+static inline void fsnotify_modify(struct dentry *dentry)
+{
+        struct inode *inode = dentry->d_inode;
+        u32 mask = IN_MODIFY;
+        if (S_ISDIR(inode->i_mode))
+                mask |= IN_ISDIR;
+        dnotify_parent(dentry, DN_MODIFY);
+        inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
+        inotify_inode_queue_event(inode, mask, 0, NULL);
+}
+/*
+ * fsnotify_open - file was opened
+ */
+static inline void fsnotify_open(struct dentry *dentry)
+{
+        struct inode *inode = dentry->d_inode;
+        u32 mask = IN_OPEN;
+        if (S_ISDIR(inode->i_mode))
+                mask |= IN_ISDIR;
+        inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
+        inotify_inode_queue_event(inode, mask, 0, NULL);        
+}
+/*
+ * fsnotify_close - file was closed
+ */
+static inline void fsnotify_close(struct file *file)
+{
+        struct dentry *dentry = file->f_dentry;
+        struct inode *inode = dentry->d_inode;
+        const char *name = dentry->d_name.name;
+        mode_t mode = file->f_mode;
+        u32 mask = (mode & FMODE_WRITE) ? IN_CLOSE_WRITE : IN_CLOSE_NOWRITE;
+        if (S_ISDIR(inode->i_mode))
+                mask |= IN_ISDIR;
+        inotify_dentry_parent_queue_event(dentry, mask, 0, name);
+        inotify_inode_queue_event(inode, mask, 0, NULL);
+}
+/*
+ * fsnotify_xattr - extended attributes were changed
+ */
+static inline void fsnotify_xattr(struct dentry *dentry)
+{
+        struct inode *inode = dentry->d_inode;
+        u32 mask = IN_ATTRIB;
+        if (S_ISDIR(inode->i_mode))
+                mask |= IN_ISDIR;
+        inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
+        inotify_inode_queue_event(inode, mask, 0, NULL);
+}
+/*
+ * fsnotify_change - notify_change event.  file was modified and/or metadata
+ * was changed.
+ */
+static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
+{
+        struct inode *inode = dentry->d_inode;
+        int dn_mask = 0;
+        u32 in_mask = 0;
+        if (ia_valid & ATTR_UID) {
+                in_mask |= IN_ATTRIB;
+                dn_mask |= DN_ATTRIB;
+        }
+        if (ia_valid & ATTR_GID) {
+                in_mask |= IN_ATTRIB;
+                dn_mask |= DN_ATTRIB;
+        }
+        if (ia_valid & ATTR_SIZE) {
+                in_mask |= IN_MODIFY;
+                dn_mask |= DN_MODIFY;
+        }
+        /* both times implies a utime(s) call */
+        if ((ia_valid & (ATTR_ATIME | ATTR_MTIME)) == (ATTR_ATIME | ATTR_MTIME))
+        {
+                in_mask |= IN_ATTRIB;
+                dn_mask |= DN_ATTRIB;
+        } else if (ia_valid & ATTR_ATIME) {
+                in_mask |= IN_ACCESS;
+                dn_mask |= DN_ACCESS;
+        } else if (ia_valid & ATTR_MTIME) {
+                in_mask |= IN_MODIFY;
+                dn_mask |= DN_MODIFY;
+        }
+        if (ia_valid & ATTR_MODE) {
+                in_mask |= IN_ATTRIB;
+                dn_mask |= DN_ATTRIB;
+        }
+        if (dn_mask)
+                dnotify_parent(dentry, dn_mask);
+        if (in_mask) {
+                if (S_ISDIR(inode->i_mode))
+                        in_mask |= IN_ISDIR;
+                inotify_inode_queue_event(inode, in_mask, 0, NULL);
+                inotify_dentry_parent_queue_event(dentry, in_mask, 0,
+                                                  dentry->d_name.name);
+        }
+}
+#ifdef CONFIG_INOTIFY   /* inotify helpers */
+/*
+ * fsnotify_oldname_init - save off the old filename before we change it
+ */
+static inline const char *fsnotify_oldname_init(const char *name)
+{
+        return kstrdup(name, GFP_KERNEL);
+}
+/*
+ * fsnotify_oldname_free - free the name we got from fsnotify_oldname_init
+ */
+static inline void fsnotify_oldname_free(const char *old_name)
+{
+        kfree(old_name);
+}
+#else   /* CONFIG_INOTIFY */
+static inline const char *fsnotify_oldname_init(const char *name)
+{
+        return NULL;
+}
+static inline void fsnotify_oldname_free(const char *old_name)
+{
+}
+#endif  /* ! CONFIG_INOTIFY */
+#endif  /* __KERNEL__ */
+#endif  /* _LINUX_FS_NOTIFY_H */
diff --git a/include/linux/ftape.h b/include/linux/ftape.h
index c6b38d5b9186..72faeec9f6e1 100644
--- a/include/linux/ftape.h
+++ b/include/linux/ftape.h
@@ -165,7 +165,7 @@ typedef union {
 #  undef  CONFIG_FT_FDC_DMA
 #  define CONFIG_FT_FDC_DMA 2
 # endif
-#elif CONFIG_FT_ALT_FDC == 1  /* CONFIG_FT_MACH2 */
+#elif defined(CONFIG_FT_ALT_FDC)  /* CONFIG_FT_MACH2 */
 # if CONFIG_FT_FDC_BASE == 0
 #  undef  CONFIG_FT_FDC_BASE
 #  define CONFIG_FT_FDC_BASE 0x370
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 8336dba18971..5912874ca83c 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -2,6 +2,7 @@
 #define LINUX_HARDIRQ_H
 #include <linux/config.h>
+#include <linux/preempt.h>
 #include <linux/smp_lock.h>
 #include <asm/hardirq.h>
 #include <asm/system.h>
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index ed2927ef1ff7..df695e9ae327 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -242,8 +242,8 @@ static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev)
 }
-static __inline__ unsigned short hdlc_type_trans(struct sk_buff *skb,
+static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb,
-                                                 struct net_device *dev)
+                                         struct net_device *dev)
 {
        hdlc_device *hdlc = dev_to_hdlc(dev);
diff --git a/include/linux/hippidevice.h b/include/linux/hippidevice.h
index 9debe6bbe5f0..bab303dafd6e 100644
--- a/include/linux/hippidevice.h
+++ b/include/linux/hippidevice.h
@@ -26,8 +26,12 @@
 #include <linux/if_hippi.h>
 #ifdef __KERNEL__
-extern unsigned short hippi_type_trans(struct sk_buff *skb,
-                                       struct net_device *dev);
+struct hippi_cb {
+        __u32   ifield;
+};
+extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev);
 extern struct net_device *alloc_hippi_dev(int sizeof_priv);
 #endif
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index f529d1442815..e670b0d13fe0 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -70,12 +70,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
 void hugetlb_prefault_arch_hook(struct mm_struct *mm);
 #endif
-#ifndef ARCH_HAS_HUGETLB_CLEAN_STALE_PGTABLE
-#define hugetlb_clean_stale_pgtable(pte)        BUG()
-#else
-void hugetlb_clean_stale_pgtable(pte_t *pte);
-#endif
 #else /* !CONFIG_HUGETLB_PAGE */
 static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)
diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
index 1b5018a965f5..7eb4004b3601 100644
--- a/include/linux/hwmon-sysfs.h
+++ b/include/linux/hwmon-sysfs.h
@@ -33,4 +33,19 @@ struct sensor_device_attribute sensor_dev_attr_##_name = {	\
        .index =        _index,                                 \
 }
+struct sensor_device_attribute_2 {
+        struct device_attribute dev_attr;
+        u8 index;
+        u8 nr;
+};
+#define to_sensor_dev_attr_2(_dev_attr) \
+        container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
+#define SENSOR_DEVICE_ATTR_2(_name,_mode,_show,_store,_nr,_index)       \
+struct sensor_device_attribute_2 sensor_dev_attr_##_name = {    \
+        .dev_attr =     __ATTR(_name,_mode,_show,_store),       \
+        .index =        _index,                                 \
+        .nr =           _nr,                                    \
+}
 #endif /* _LINUX_HWMON_SYSFS_H */
diff --git a/include/linux/hwmon-vid.h b/include/linux/hwmon-vid.h
new file mode 100644
index 000000000000..cd4b7a042b86
--- /dev/null
+++ b/include/linux/hwmon-vid.h
@@ -0,0 +1,45 @@
+/*
+    hwmon-vid.h - VID/VRM/VRD voltage conversions
+    Originally part of lm_sensors
+    Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
+    With assistance from Trent Piepho <xyzzy@speakeasy.org>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef _LINUX_HWMON_VID_H
+#define _LINUX_HWMON_VID_H
+int vid_from_reg(int val, int vrm);
+int vid_which_vrm(void);
+/* vrm is the VRM/VRD document version multiplied by 10.
+   val is in mV to avoid floating point in the kernel.
+   Returned value is the 4-, 5- or 6-bit VID code.
+   Note that only VRM 9.x is supported for now. */
+static inline int vid_to_reg(int val, int vrm)
+{
+        switch (vrm) {
+        case 91:                /* VRM 9.1 */
+        case 90:                /* VRM 9.0 */
+                return ((val >= 1100) && (val <= 1850) ?
+                        ((18499 - val * 10) / 25 + 5) / 10 : -1);
+        default:
+                return -1;
+        }
+}
+#endif /* _LINUX_HWMON_VID_H */
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
new file mode 100644
index 000000000000..0efd994c37f1
--- /dev/null
+++ b/include/linux/hwmon.h
@@ -0,0 +1,35 @@
+/*
+    hwmon.h - part of lm_sensors, Linux kernel modules for hardware monitoring
+    This file declares helper functions for the sysfs class "hwmon",
+    for use by sensors drivers.
+    Copyright (C) 2005 Mark M. Hoffman <mhoffman@lightlink.com>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+*/
+#ifndef _HWMON_H_
+#define _HWMON_H_
+#include <linux/device.h>
+struct class_device *hwmon_device_register(struct device *dev);
+void hwmon_device_unregister(struct class_device *cdev);
+/* Scale user input to sensible values */
+static inline int SENSORS_LIMIT(long value, long low, long high)
+{
+        if (value < low)
+                return low;
+        else if (value > high)
+                return high;
+        else
+                return value;
+}
+#endif
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 33f08258f22b..44f30876a1c9 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -1,6 +1,6 @@
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
-/* i2c.h - definitions for the i2c-bus interface                             */
+/* i2c-id.h - identifier values for i2c drivers and adapters                 */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 /*   Copyright (C) 1995-1999 Simon G. Vogl
@@ -24,16 +24,6 @@
 #define LINUX_I2C_ID_H
 /*
- * This file is part of the i2c-bus package and contains the identifier
- * values for drivers, adapters and other folk populating these serial
- * worlds. 
- *
- * These will change often (i.e. additions) , therefore this has been 
- * separated from the functional interface definitions of the i2c api.
- *
- */
-/*
 * ---- Driver types -----------------------------------------------------
 *       device id name + number        function description, i2c address(es)
 *
@@ -170,151 +160,113 @@
 /*
 * ---- Adapter types ----------------------------------------------------
- *
- * First, we distinguish between several algorithms to access the hardware
- * interface types, as a PCF 8584 needs other care than a bit adapter.
- */
-#define I2C_ALGO_NONE   0x000000
-#define I2C_ALGO_BIT    0x010000        /* bit style adapters           */
-#define I2C_ALGO_PCF    0x020000        /* PCF 8584 style adapters      */
-#define I2C_ALGO_ATI    0x030000        /* ATI video card               */
-#define I2C_ALGO_SMBUS  0x040000
-#define I2C_ALGO_ISA    0x050000        /* lm_sensors ISA pseudo-adapter */
-#define I2C_ALGO_SAA7146 0x060000       /* SAA 7146 video decoder bus   */
-#define I2C_ALGO_ACB    0x070000        /* ACCESS.bus algorithm         */
-#define I2C_ALGO_IIC    0x080000        /* ITE IIC bus */
-#define I2C_ALGO_SAA7134 0x090000
-#define I2C_ALGO_MPC824X 0x0a0000       /* Motorola 8240 / 8245         */
-#define I2C_ALGO_IPMI   0x0b0000        /* IPMI dummy adapter */
-#define I2C_ALGO_IPMB   0x0c0000        /* IPMB adapter */
-#define I2C_ALGO_MPC107 0x0d0000
-#define I2C_ALGO_EC     0x100000        /* ACPI embedded controller     */
-#define I2C_ALGO_MPC8XX 0x110000        /* MPC8xx PowerPC I2C algorithm */
-#define I2C_ALGO_OCP    0x120000        /* IBM or otherwise On-chip I2C algorithm */
-#define I2C_ALGO_BITHS  0x130000        /* enhanced bit style adapters  */
-#define I2C_ALGO_IOP3XX 0x140000        /* XSCALE IOP3XX On-chip I2C alg */
-#define I2C_ALGO_SIBYTE 0x150000        /* Broadcom SiByte SOCs         */
-#define I2C_ALGO_SGI    0x160000        /* SGI algorithm                */
-#define I2C_ALGO_USB    0x170000        /* USB algorithm                */
-#define I2C_ALGO_VIRT   0x180000        /* Virtual bus adapter          */
-#define I2C_ALGO_MV64XXX 0x190000       /* Marvell mv64xxx i2c ctlr     */
-#define I2C_ALGO_PCA    0x1a0000        /* PCA 9564 style adapters      */
-#define I2C_ALGO_AU1550 0x1b0000        /* Au1550 PSC algorithm         */
-#define I2C_ALGO_EXP    0x800000        /* experimental                 */
-#define I2C_ALGO_MASK   0xff0000        /* Mask for algorithms          */
-#define I2C_ALGO_SHIFT  0x10    /* right shift to get index values      */
-#define I2C_HW_ADAPS    0x10000         /* # adapter types              */
-#define I2C_HW_MASK     0xffff          
-/* hw specific modules that are defined per algorithm layer
 */
 /* --- Bit algorithm adapters                                           */
-#define I2C_HW_B_LP     0x00    /* Parallel port Philips style adapter  */
+#define I2C_HW_B_LP             0x010000 /* Parallel port Philips style */
-#define I2C_HW_B_LPC    0x01    /* Parallel port, over control reg.     */
+#define I2C_HW_B_LPC            0x010001 /* Parallel port control reg. */
-#define I2C_HW_B_SER    0x02    /* Serial line interface                */
+#define I2C_HW_B_SER            0x010002 /* Serial line interface */
-#define I2C_HW_B_ELV    0x03    /* ELV Card                             */
+#define I2C_HW_B_ELV            0x010003 /* ELV Card */
-#define I2C_HW_B_VELLE  0x04    /* Vellemann K8000                      */
+#define I2C_HW_B_VELLE          0x010004 /* Vellemann K8000 */
-#define I2C_HW_B_BT848  0x05    /* BT848 video boards                   */
+#define I2C_HW_B_BT848          0x010005 /* BT848 video boards */
-#define I2C_HW_B_WNV    0x06    /* Winnov Videums                       */
+#define I2C_HW_B_WNV            0x010006 /* Winnov Videums */
-#define I2C_HW_B_VIA    0x07    /* Via vt82c586b                        */
+#define I2C_HW_B_VIA            0x010007 /* Via vt82c586b */
-#define I2C_HW_B_HYDRA  0x08    /* Apple Hydra Mac I/O                  */
+#define I2C_HW_B_HYDRA          0x010008 /* Apple Hydra Mac I/O */
-#define I2C_HW_B_G400   0x09    /* Matrox G400                          */
+#define I2C_HW_B_G400           0x010009 /* Matrox G400 */
-#define I2C_HW_B_I810   0x0a    /* Intel I810                           */
+#define I2C_HW_B_I810           0x01000a /* Intel I810 */
-#define I2C_HW_B_VOO    0x0b    /* 3dfx Voodoo 3 / Banshee              */
+#define I2C_HW_B_VOO            0x01000b /* 3dfx Voodoo 3 / Banshee */
-#define I2C_HW_B_PPORT  0x0c    /* Primitive parallel port adapter      */
+#define I2C_HW_B_PPORT          0x01000c /* Primitive parallel port adapter */
-#define I2C_HW_B_SAVG   0x0d    /* Savage 4                             */
+#define I2C_HW_B_SAVG           0x01000d /* Savage 4 */
-#define I2C_HW_B_SCX200 0x0e    /* Nat'l Semi SCx200 I2C                */
+#define I2C_HW_B_SCX200         0x01000e /* Nat'l Semi SCx200 I2C */
-#define I2C_HW_B_RIVA   0x10    /* Riva based graphics cards            */
+#define I2C_HW_B_RIVA           0x010010 /* Riva based graphics cards */
-#define I2C_HW_B_IOC    0x11    /* IOC bit-wiggling                     */
+#define I2C_HW_B_IOC            0x010011 /* IOC bit-wiggling */
-#define I2C_HW_B_TSUNA  0x12    /* DEC Tsunami chipset                  */
+#define I2C_HW_B_TSUNA          0x010012 /* DEC Tsunami chipset */
-#define I2C_HW_B_FRODO  0x13    /* 2d3D, Inc. SA-1110 Development Board */
+#define I2C_HW_B_FRODO          0x010013 /* 2d3D SA-1110 Development Board */
-#define I2C_HW_B_OMAHA  0x14    /* Omaha I2C interface (ARM)            */
+#define I2C_HW_B_OMAHA          0x010014 /* Omaha I2C interface (ARM) */
-#define I2C_HW_B_GUIDE  0x15    /* Guide bit-basher                     */
+#define I2C_HW_B_GUIDE          0x010015 /* Guide bit-basher */
-#define I2C_HW_B_IXP2000 0x16   /* GPIO on IXP2000 systems              */
+#define I2C_HW_B_IXP2000        0x010016 /* GPIO on IXP2000 systems */
-#define I2C_HW_B_IXP4XX 0x17    /* GPIO on IXP4XX systems               */
+#define I2C_HW_B_IXP4XX         0x010017 /* GPIO on IXP4XX systems */
-#define I2C_HW_B_S3VIA  0x18    /* S3Via ProSavage adapter              */
+#define I2C_HW_B_S3VIA          0x010018 /* S3Via ProSavage adapter */
-#define I2C_HW_B_ZR36067 0x19   /* Zoran-36057/36067 based boards       */
+#define I2C_HW_B_ZR36067        0x010019 /* Zoran-36057/36067 based boards */
-#define I2C_HW_B_PCILYNX 0x1a   /* TI PCILynx I2C adapter               */
+#define I2C_HW_B_PCILYNX        0x01001a /* TI PCILynx I2C adapter */
-#define I2C_HW_B_CX2388x 0x1b   /* connexant 2388x based tv cards       */
+#define I2C_HW_B_CX2388x        0x01001b /* connexant 2388x based tv cards */
+#define I2C_HW_B_NVIDIA         0x01001c /* nvidia framebuffer driver */
+#define I2C_HW_B_SAVAGE         0x01001d /* savage framebuffer driver */
+#define I2C_HW_B_RADEON         0x01001e /* radeon framebuffer driver */
 /* --- PCF 8584 based algorithms                                        */
-#define I2C_HW_P_LP     0x00    /* Parallel port interface              */
+#define I2C_HW_P_LP             0x020000 /* Parallel port interface */
-#define I2C_HW_P_ISA    0x01    /* generic ISA Bus inteface card        */
+#define I2C_HW_P_ISA            0x020001 /* generic ISA Bus inteface card */
-#define I2C_HW_P_ELEK   0x02    /* Elektor ISA Bus inteface card        */
+#define I2C_HW_P_ELEK           0x020002 /* Elektor ISA Bus inteface card */
 /* --- PCA 9564 based algorithms */
-#define I2C_HW_A_ISA    0x00    /* generic ISA Bus interface card       */
+#define I2C_HW_A_ISA            0x1a0000 /* generic ISA Bus interface card */
 /* --- ACPI Embedded controller algorithms                              */
-#define I2C_HW_ACPI_EC          0x00
+#define I2C_HW_ACPI_EC          0x1f0000
 /* --- MPC824x PowerPC adapters                                         */
-#define I2C_HW_MPC824X 0x00     /* Motorola 8240 / 8245                 */
+#define I2C_HW_MPC824X          0x100001 /* Motorola 8240 / 8245 */
 /* --- MPC8xx PowerPC adapters                                          */
-#define I2C_HW_MPC8XX_EPON 0x00 /* Eponymous MPC8xx I2C adapter         */
+#define I2C_HW_MPC8XX_EPON      0x110000 /* Eponymous MPC8xx I2C adapter */
 /* --- ITE based algorithms                                             */
-#define I2C_HW_I_IIC    0x00    /* controller on the ITE */
+#define I2C_HW_I_IIC            0x080000 /* controller on the ITE */
 /* --- PowerPC on-chip adapters                                         */
-#define I2C_HW_OCP 0x00 /* IBM on-chip I2C adapter      */
+#define I2C_HW_OCP              0x120000 /* IBM on-chip I2C adapter */
 /* --- Broadcom SiByte adapters                                         */
-#define I2C_HW_SIBYTE   0x00
+#define I2C_HW_SIBYTE           0x150000
 /* --- SGI adapters                                                     */
-#define I2C_HW_SGI_VINO 0x00
+#define I2C_HW_SGI_VINO         0x160000
-#define I2C_HW_SGI_MACE 0x01
+#define I2C_HW_SGI_MACE         0x160001
 /* --- XSCALE on-chip adapters                          */
-#define I2C_HW_IOP3XX 0x00
+#define I2C_HW_IOP3XX           0x140000
 /* --- Au1550 PSC adapters adapters                                     */
-#define I2C_HW_AU1550_PSC       0x00
+#define I2C_HW_AU1550_PSC       0x1b0000
 /* --- SMBus only adapters                                              */
-#define I2C_HW_SMBUS_PIIX4      0x00
+#define I2C_HW_SMBUS_PIIX4      0x040000
-#define I2C_HW_SMBUS_ALI15X3    0x01
+#define I2C_HW_SMBUS_ALI15X3    0x040001
-#define I2C_HW_SMBUS_VIA2       0x02
+#define I2C_HW_SMBUS_VIA2       0x040002
-#define I2C_HW_SMBUS_VOODOO3    0x03
+#define I2C_HW_SMBUS_VOODOO3    0x040003
-#define I2C_HW_SMBUS_I801       0x04
+#define I2C_HW_SMBUS_I801       0x040004
-#define I2C_HW_SMBUS_AMD756     0x05
+#define I2C_HW_SMBUS_AMD756     0x040005
-#define I2C_HW_SMBUS_SIS5595    0x06
+#define I2C_HW_SMBUS_SIS5595    0x040006
-#define I2C_HW_SMBUS_ALI1535    0x07
+#define I2C_HW_SMBUS_ALI1535    0x040007
-#define I2C_HW_SMBUS_SIS630     0x08
+#define I2C_HW_SMBUS_SIS630     0x040008
-#define I2C_HW_SMBUS_SIS96X     0x09
+#define I2C_HW_SMBUS_SIS96X     0x040009
-#define I2C_HW_SMBUS_AMD8111    0x0a
+#define I2C_HW_SMBUS_AMD8111    0x04000a
-#define I2C_HW_SMBUS_SCX200     0x0b
+#define I2C_HW_SMBUS_SCX200     0x04000b
-#define I2C_HW_SMBUS_NFORCE2    0x0c
+#define I2C_HW_SMBUS_NFORCE2    0x04000c
-#define I2C_HW_SMBUS_W9968CF    0x0d
+#define I2C_HW_SMBUS_W9968CF    0x04000d
-#define I2C_HW_SMBUS_OV511      0x0e    /* OV511(+) USB 1.1 webcam ICs  */
+#define I2C_HW_SMBUS_OV511      0x04000e /* OV511(+) USB 1.1 webcam ICs */
-#define I2C_HW_SMBUS_OV518      0x0f    /* OV518(+) USB 1.1 webcam ICs  */
+#define I2C_HW_SMBUS_OV518      0x04000f /* OV518(+) USB 1.1 webcam ICs */
-#define I2C_HW_SMBUS_OV519      0x10    /* OV519 USB 1.1 webcam IC      */
+#define I2C_HW_SMBUS_OV519      0x040010 /* OV519 USB 1.1 webcam IC */
-#define I2C_HW_SMBUS_OVFX2      0x11    /* Cypress/OmniVision FX2 webcam */
+#define I2C_HW_SMBUS_OVFX2      0x040011 /* Cypress/OmniVision FX2 webcam */
 /* --- ISA pseudo-adapter                                               */
-#define I2C_HW_ISA 0x00
+#define I2C_HW_ISA              0x050000
 /* --- IPMI pseudo-adapter                                              */
-#define I2C_HW_IPMI 0x00
+#define I2C_HW_IPMI             0x0b0000
 /* --- IPMB adapter                                             */
-#define I2C_HW_IPMB 0x00
+#define I2C_HW_IPMB             0x0c0000
 /* --- MCP107 adapter */
-#define I2C_HW_MPC107 0x00
+#define I2C_HW_MPC107           0x0d0000
 /* --- Marvell mv64xxx i2c adapter */
-#define I2C_HW_MV64XXX 0x00
+#define I2C_HW_MV64XXX          0x190000
+/* --- Miscellaneous adapters */
+#define I2C_HW_SAA7146          0x060000 /* SAA7146 video decoder bus */
+#define I2C_HW_SAA7134          0x090000 /* SAA7134 video decoder bus */
 #endif /* LINUX_I2C_ID_H */
diff --git a/include/linux/i2c-isa.h b/include/linux/i2c-isa.h
new file mode 100644
index 000000000000..67e3598c4cec
--- /dev/null
+++ b/include/linux/i2c-isa.h
@@ -0,0 +1,36 @@
+/*
+ * i2c-isa.h - definitions for the i2c-isa pseudo-i2c-adapter interface
+ *
+ * Copyright (C) 2005 Jean Delvare <khali@linux-fr.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef _LINUX_I2C_ISA_H
+#define _LINUX_I2C_ISA_H
+#include <linux/i2c.h>
+extern int i2c_isa_add_driver(struct i2c_driver *driver);
+extern int i2c_isa_del_driver(struct i2c_driver *driver);
+/* Detect whether we are on the isa bus. This is only useful to hybrid
+   (i2c+isa) drivers. */
+#define i2c_is_isa_adapter(adapptr) \
+        ((adapptr)->id == I2C_HW_ISA)
+#define i2c_is_isa_client(clientptr) \
+        i2c_is_isa_adapter((clientptr)->adapter)
+#endif /* _LINUX_I2C_ISA_H */
diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h
deleted file mode 100644
index 21b625204956..000000000000
--- a/include/linux/i2c-sensor.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-    i2c-sensor.h - Part of the i2c package
-    was originally sensors.h - Part of lm_sensors, Linux kernel modules
-                               for hardware monitoring
-    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-#ifndef _LINUX_I2C_SENSOR_H
-#define _LINUX_I2C_SENSOR_H
-/* A structure containing detect information.
-   Force variables overrule all other variables; they force a detection on
-   that place. If a specific chip is given, the module blindly assumes this
-   chip type is present; if a general force (kind == 0) is given, the module
-   will still try to figure out what type of chip is present. This is useful
-   if for some reasons the detect for SMBus or ISA address space filled
-   fails.
-   probe: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values.
-     A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for
-     the ISA bus, -1 for any I2C bus), the second is the address. 
-   kind: The kind of chip. 0 equals any chip.
-*/
-struct i2c_force_data {
-        unsigned short *force;
-        unsigned short kind;
-};
-/* A structure containing the detect information.
-   normal_i2c: filled in by the module writer. Terminated by I2C_CLIENT_ISA_END.
-     A list of I2C addresses which should normally be examined.
-   normal_isa: filled in by the module writer. Terminated by SENSORS_ISA_END.
-     A list of ISA addresses which should normally be examined.
-   probe: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values.
-     A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for
-     the ISA bus, -1 for any I2C bus), the second is the address. These
-     addresses are also probed, as if they were in the 'normal' list.
-   ignore: insmod parameter. Initialize this list with I2C_CLIENT_ISA_END values.
-     A list of pairs. The first value is a bus number (ANY_I2C_ISA_BUS for
-     the ISA bus, -1 for any I2C bus), the second is the I2C address. These
-     addresses are never probed. This parameter overrules 'normal' and 
-     'probe', but not the 'force' lists.
-   force_data: insmod parameters. A list, ending with an element of which
-     the force field is NULL.
-*/
-struct i2c_address_data {
-        unsigned short *normal_i2c;
-        unsigned int *normal_isa;
-        unsigned short *probe;
-        unsigned short *ignore;
-        struct i2c_force_data *forces;
-};
-#define SENSORS_MODULE_PARM_FORCE(name) \
-  I2C_CLIENT_MODULE_PARM(force_ ## name, \
-                      "List of adapter,address pairs which are unquestionably" \
-                      " assumed to contain a `" # name "' chip")
-/* This defines several insmod variables, and the addr_data structure */
-#define SENSORS_INSMOD \
-  I2C_CLIENT_MODULE_PARM(probe, \
-                      "List of adapter,address pairs to scan additionally"); \
-  I2C_CLIENT_MODULE_PARM(ignore, \
-                      "List of adapter,address pairs not to scan"); \
-        static struct i2c_address_data addr_data = {                    \
-                        .normal_i2c =           normal_i2c,             \
-                        .normal_isa =           normal_isa,             \
-                        .probe =                probe,                  \
-                        .ignore =               ignore,                 \
-                        .forces =               forces,                 \
-                }
-/* The following functions create an enum with the chip names as elements. 
-   The first element of the enum is any_chip. These are the only macros
-   a module will want to use. */
-#define SENSORS_INSMOD_0 \
-  enum chips { any_chip }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  static struct i2c_force_data forces[] = {{force,any_chip},{NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_1(chip1) \
-  enum chips { any_chip, chip1 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  static struct i2c_force_data forces[] = {{force,any_chip},\
-                                                 {force_ ## chip1,chip1}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_2(chip1,chip2) \
-  enum chips { any_chip, chip1, chip2 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  SENSORS_MODULE_PARM_FORCE(chip2); \
-  static struct i2c_force_data forces[] = {{force,any_chip}, \
-                                                 {force_ ## chip1,chip1}, \
-                                                 {force_ ## chip2,chip2}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_3(chip1,chip2,chip3) \
-  enum chips { any_chip, chip1, chip2, chip3 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  SENSORS_MODULE_PARM_FORCE(chip2); \
-  SENSORS_MODULE_PARM_FORCE(chip3); \
-  static struct i2c_force_data forces[] = {{force,any_chip}, \
-                                                 {force_ ## chip1,chip1}, \
-                                                 {force_ ## chip2,chip2}, \
-                                                 {force_ ## chip3,chip3}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_4(chip1,chip2,chip3,chip4) \
-  enum chips { any_chip, chip1, chip2, chip3, chip4 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  SENSORS_MODULE_PARM_FORCE(chip2); \
-  SENSORS_MODULE_PARM_FORCE(chip3); \
-  SENSORS_MODULE_PARM_FORCE(chip4); \
-  static struct i2c_force_data forces[] = {{force,any_chip}, \
-                                                 {force_ ## chip1,chip1}, \
-                                                 {force_ ## chip2,chip2}, \
-                                                 {force_ ## chip3,chip3}, \
-                                                 {force_ ## chip4,chip4}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_5(chip1,chip2,chip3,chip4,chip5) \
-  enum chips { any_chip, chip1, chip2, chip3, chip4, chip5 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  SENSORS_MODULE_PARM_FORCE(chip2); \
-  SENSORS_MODULE_PARM_FORCE(chip3); \
-  SENSORS_MODULE_PARM_FORCE(chip4); \
-  SENSORS_MODULE_PARM_FORCE(chip5); \
-  static struct i2c_force_data forces[] = {{force,any_chip}, \
-                                                 {force_ ## chip1,chip1}, \
-                                                 {force_ ## chip2,chip2}, \
-                                                 {force_ ## chip3,chip3}, \
-                                                 {force_ ## chip4,chip4}, \
-                                                 {force_ ## chip5,chip5}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_6(chip1,chip2,chip3,chip4,chip5,chip6) \
-  enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  SENSORS_MODULE_PARM_FORCE(chip2); \
-  SENSORS_MODULE_PARM_FORCE(chip3); \
-  SENSORS_MODULE_PARM_FORCE(chip4); \
-  SENSORS_MODULE_PARM_FORCE(chip5); \
-  SENSORS_MODULE_PARM_FORCE(chip6); \
-  static struct i2c_force_data forces[] = {{force,any_chip}, \
-                                                 {force_ ## chip1,chip1}, \
-                                                 {force_ ## chip2,chip2}, \
-                                                 {force_ ## chip3,chip3}, \
-                                                 {force_ ## chip4,chip4}, \
-                                                 {force_ ## chip5,chip5}, \
-                                                 {force_ ## chip6,chip6}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_7(chip1,chip2,chip3,chip4,chip5,chip6,chip7) \
-  enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6, chip7 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  SENSORS_MODULE_PARM_FORCE(chip2); \
-  SENSORS_MODULE_PARM_FORCE(chip3); \
-  SENSORS_MODULE_PARM_FORCE(chip4); \
-  SENSORS_MODULE_PARM_FORCE(chip5); \
-  SENSORS_MODULE_PARM_FORCE(chip6); \
-  SENSORS_MODULE_PARM_FORCE(chip7); \
-  static struct i2c_force_data forces[] = {{force,any_chip}, \
-                                                 {force_ ## chip1,chip1}, \
-                                                 {force_ ## chip2,chip2}, \
-                                                 {force_ ## chip3,chip3}, \
-                                                 {force_ ## chip4,chip4}, \
-                                                 {force_ ## chip5,chip5}, \
-                                                 {force_ ## chip6,chip6}, \
-                                                 {force_ ## chip7,chip7}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-#define SENSORS_INSMOD_8(chip1,chip2,chip3,chip4,chip5,chip6,chip7,chip8) \
-  enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6, chip7, chip8 }; \
-  I2C_CLIENT_MODULE_PARM(force, \
-                      "List of adapter,address pairs to boldly assume " \
-                      "to be present"); \
-  SENSORS_MODULE_PARM_FORCE(chip1); \
-  SENSORS_MODULE_PARM_FORCE(chip2); \
-  SENSORS_MODULE_PARM_FORCE(chip3); \
-  SENSORS_MODULE_PARM_FORCE(chip4); \
-  SENSORS_MODULE_PARM_FORCE(chip5); \
-  SENSORS_MODULE_PARM_FORCE(chip6); \
-  SENSORS_MODULE_PARM_FORCE(chip7); \
-  SENSORS_MODULE_PARM_FORCE(chip8); \
-  static struct i2c_force_data forces[] = {{force,any_chip}, \
-                                                 {force_ ## chip1,chip1}, \
-                                                 {force_ ## chip2,chip2}, \
-                                                 {force_ ## chip3,chip3}, \
-                                                 {force_ ## chip4,chip4}, \
-                                                 {force_ ## chip5,chip5}, \
-                                                 {force_ ## chip6,chip6}, \
-                                                 {force_ ## chip7,chip7}, \
-                                                 {force_ ## chip8,chip8}, \
-                                                 {NULL}}; \
-  SENSORS_INSMOD
-/* Detect function. It iterates over all possible addresses itself. For
-   SMBus addresses, it will only call found_proc if some client is connected
-   to the SMBus (unless a 'force' matched); for ISA detections, this is not
-   done. */
-extern int i2c_detect(struct i2c_adapter *adapter,
-                      struct i2c_address_data *address_data,
-                      int (*found_proc) (struct i2c_adapter *, int, int));
-/* This macro is used to scale user-input to sensible values in almost all
-   chip drivers. */
-static inline int SENSORS_LIMIT(long value, long low, long high)
-{
-        if (value < low)
-                return low;
-        else if (value > high)
-                return high;
-        else
-                return value;
-}
-#endif                          /* def _LINUX_I2C_SENSOR_H */
diff --git a/include/linux/i2c-vid.h b/include/linux/i2c-vid.h
deleted file mode 100644
index 41d0635e0ba9..000000000000
--- a/include/linux/i2c-vid.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-    i2c-vid.h - Part of lm_sensors, Linux kernel modules for hardware
-                monitoring
-    Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
-    With assistance from Trent Piepho <xyzzy@speakeasy.org>
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
-    This file contains common code for decoding VID pins.
-    This file is #included in various chip drivers in this directory.
-    As the user is unlikely to load more than one driver which
-    includes this code we don't worry about the wasted space.
-    Reference: VRM x.y DC-DC Converter Design Guidelines,
-    available at http://developer.intel.com
-*/
-/*
-    AMD Opteron processors don't follow the Intel VRM spec.
-    I'm going to "make up" 2.4 as the VRM spec for the Opterons.
-    No good reason just a mnemonic for the 24x Opteron processor
-    series
-    Opteron VID encoding is:
-       00000  =  1.550 V
-       00001  =  1.525 V
-        . . . .
-       11110  =  0.800 V
-       11111  =  0.000 V (off)
- */
-/*
-    Legal val values 0x00 - 0x1f; except for VRD 10.0, 0x00 - 0x3f.
-    vrm is the Intel VRM document version.
-    Note: vrm version is scaled by 10 and the return value is scaled by 1000
-    to avoid floating point in the kernel.
-*/
-int i2c_which_vrm(void);
-#define DEFAULT_VRM     82
-static inline int vid_from_reg(int val, int vrm)
-{
-        int vid;
-        switch(vrm) {
-        case  0:
-                return 0;
-        case 100:               /* VRD 10.0 */
-                if((val & 0x1f) == 0x1f)
-                        return 0;
-                if((val & 0x1f) <= 0x09 || val == 0x0a)
-                        vid = 10875 - (val & 0x1f) * 250;
-                else
-                        vid = 18625 - (val & 0x1f) * 250;
-                if(val & 0x20)
-                        vid -= 125;
-                vid /= 10;      /* only return 3 dec. places for now */
-                return vid;
-        case 24:                /* Opteron processor */
-                return(val == 0x1f ? 0 : 1550 - val * 25);
-        case 91:                /* VRM 9.1 */
-        case 90:                /* VRM 9.0 */
-                return(val == 0x1f ? 0 :
-                                       1850 - val * 25);
-        case 85:                /* VRM 8.5 */
-                return((val & 0x10  ? 25 : 0) +
-                       ((val & 0x0f) > 0x04 ? 2050 : 1250) -
-                       ((val & 0x0f) * 50));
-        case 84:                /* VRM 8.4 */
-                val &= 0x0f;
-                                /* fall through */
-        default:                /* VRM 8.2 */
-                return(val == 0x1f ? 0 :
-                       val & 0x10  ? 5100 - (val) * 100 :
-                                     2050 - (val) * 50);
-        }
-}
-static inline int vid_to_reg(int val, int vrm)
-{
-        switch (vrm) {
-        case 91:                /* VRM 9.1 */
-        case 90:                /* VRM 9.0 */
-                return ((val >= 1100) && (val <= 1850) ?
-                        ((18499 - val * 10) / 25 + 5) / 10 : -1);
-        default:
-                return -1;
-        }
-}
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index be837b13f297..be35332b67e6 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -34,6 +34,13 @@
 #include <linux/device.h>       /* for struct device */
 #include <asm/semaphore.h>
+/* --- For i2c-isa ---------------------------------------------------- */
+extern void i2c_adapter_dev_release(struct device *dev);
+extern struct device_driver i2c_adapter_driver;
+extern struct class i2c_adapter_class;
+extern struct bus_type i2c_bus_type;
 /* --- General options ------------------------------------------------ */
 struct i2c_msg;
@@ -41,7 +48,6 @@ struct i2c_algorithm;
 struct i2c_adapter;
 struct i2c_client;
 struct i2c_driver;
-struct i2c_client_address_data;
 union i2c_smbus_data;
 /*
@@ -143,12 +149,9 @@ struct i2c_driver {
 */
 struct i2c_client {
        unsigned int flags;             /* div., see below              */
-        unsigned int addr;              /* chip address - NOTE: 7bit    */
+        unsigned short addr;            /* chip address - NOTE: 7bit    */
                                        /* addresses are stored in the  */
-                                        /* _LOWER_ 7 bits of this char  */
+                                        /* _LOWER_ 7 bits               */
-        /* addr: unsigned int to make lm_sensors i2c-isa adapter work
-          more cleanly. It does not take any more memory space, due to
-          alignment considerations */
        struct i2c_adapter *adapter;    /* the adapter we sit on        */
        struct i2c_driver *driver;      /* and our access routines      */
        int usage_count;                /* How many accesses currently  */
@@ -160,6 +163,11 @@ struct i2c_client {
 };
 #define to_i2c_client(d) container_of(d, struct i2c_client, dev)
+static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
+{
+        return to_i2c_client(container_of(kobj, struct device, kobj));
+}
 static inline void *i2c_get_clientdata (struct i2c_client *dev)
 {
        return dev_get_drvdata (&dev->dev);
@@ -170,13 +178,6 @@ static inline void i2c_set_clientdata (struct i2c_client *dev, void *data)
        dev_set_drvdata (&dev->dev, data);
 }
-#define I2C_DEVNAME(str)        .name = str
-static inline char *i2c_clientname(struct i2c_client *c)
-{
-        return &c->name[0];
-}
 /*
 * The following structs are for those who like to implement new bus drivers:
 * i2c_algorithm is the interface to a class of hardware solutions which can
@@ -184,9 +185,6 @@ static inline char *i2c_clientname(struct i2c_client *c)
 * to name two of the most common.
 */
 struct i2c_algorithm {
-        char name[32];                          /* textual description  */
-        unsigned int id;
        /* If an adapter algorithm can't do I2C-level access, set master_xfer
           to NULL. If an adapter algorithm can do SMBus access, set 
           smbus_xfer. If set to NULL, the SMBus protocol is simulated
@@ -214,8 +212,7 @@ struct i2c_algorithm {
 */
 struct i2c_adapter {
        struct module *owner;
-        unsigned int id;/* == is algo->id | hwdep.struct->id,           */
+        unsigned int id;
-                        /* for registered values see below              */
        unsigned int class;
        struct i2c_algorithm *algo;/* the algorithm to access the bus   */
        void *algo_data;
@@ -292,12 +289,11 @@ struct i2c_client_address_data {
        unsigned short *normal_i2c;
        unsigned short *probe;
        unsigned short *ignore;
-        unsigned short *force;
+        unsigned short **forces;
 };
 /* Internal numbers to terminate lists */
 #define I2C_CLIENT_END          0xfffeU
-#define I2C_CLIENT_ISA_END      0xfffefffeU
 /* The numbers to use to set I2C bus address */
 #define ANY_I2C_BUS             0xffff
@@ -356,10 +352,6 @@ extern int i2c_probe(struct i2c_adapter *adapter,
 */
 extern int i2c_control(struct i2c_client *,unsigned int, unsigned long);
-/* This call returns a unique low identifier for each registered adapter,
- * or -1 if the adapter was not registered. 
- */
-extern int i2c_adapter_id(struct i2c_adapter *adap);
 extern struct i2c_adapter* i2c_get_adapter(int id);
 extern void i2c_put_adapter(struct i2c_adapter *adap);
@@ -376,6 +368,12 @@ static inline int i2c_check_functionality(struct i2c_adapter *adap, u32 func)
        return (func & i2c_get_functionality(adap)) == func;
 }
+/* Return id number for a specific adapter */
+static inline int i2c_adapter_id(struct i2c_adapter *adap)
+{
+        return adap->nr;
+}
 /*
 * I2C Message - used for pure i2c transaction, also from /dev interface
 */
@@ -510,9 +508,6 @@ union i2c_smbus_data {
 #define I2C_FUNCS       0x0705  /* Get the adapter functionality */
 #define I2C_RDWR        0x0707  /* Combined R/W transfer (one stop only)*/
 #define I2C_PEC         0x0708  /* != 0 for SMBus PEC                   */
-#if 0
-#define I2C_ACK_TEST    0x0710  /* See if a slave is at a specific address */
-#endif
 #define I2C_SMBUS       0x0720  /* SMBus-level access */
@@ -556,27 +551,148 @@ union i2c_smbus_data {
  module_param_array(var, short, &var##_num, 0); \
  MODULE_PARM_DESC(var,desc)
-/* This is the one you want to use in your own modules */
+#define I2C_CLIENT_MODULE_PARM_FORCE(name)                              \
+I2C_CLIENT_MODULE_PARM(force_##name,                                    \
+                       "List of adapter,address pairs which are "       \
+                       "unquestionably assumed to contain a `"          \
+                       # name "' chip")
+#define I2C_CLIENT_INSMOD_COMMON                                        \
+I2C_CLIENT_MODULE_PARM(probe, "List of adapter,address pairs to scan "  \
+                       "additionally");                                 \
+I2C_CLIENT_MODULE_PARM(ignore, "List of adapter,address pairs not to "  \
+                       "scan");                                         \
+static struct i2c_client_address_data addr_data = {                     \
+        .normal_i2c     = normal_i2c,                                   \
+        .probe          = probe,                                        \
+        .ignore         = ignore,                                       \
+        .forces         = forces,                                       \
+}
+/* These are the ones you want to use in your own drivers. Pick the one
+   which matches the number of devices the driver differenciates between. */
 #define I2C_CLIENT_INSMOD \
-  I2C_CLIENT_MODULE_PARM(probe, \
-                      "List of adapter,address pairs to scan additionally"); \
-  I2C_CLIENT_MODULE_PARM(ignore, \
-                      "List of adapter,address pairs not to scan"); \
  I2C_CLIENT_MODULE_PARM(force, \
                      "List of adapter,address pairs to boldly assume " \
                      "to be present"); \
-        static struct i2c_client_address_data addr_data = {             \
+        static unsigned short *forces[] = {                             \
-                        .normal_i2c =           normal_i2c,             \
+                        force,                                          \
-                        .probe =                probe,                  \
+                        NULL                                            \
-                        .ignore =               ignore,                 \
+                };                                                      \
-                        .force =                force,                  \
+I2C_CLIENT_INSMOD_COMMON
-                }
+#define I2C_CLIENT_INSMOD_1(chip1)                                      \
-/* Detect whether we are on the isa bus. If this returns true, all i2c
+enum chips { any_chip, chip1 };                                         \
-   access will fail! */
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
-#define i2c_is_isa_client(clientptr) \
+                       "boldly assume to be present");                  \
-        ((clientptr)->adapter->algo->id == I2C_ALGO_ISA)
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-#define i2c_is_isa_adapter(adapptr) \
+static unsigned short *forces[] = { force, force_##chip1, NULL };       \
-        ((adapptr)->algo->id == I2C_ALGO_ISA)
+I2C_CLIENT_INSMOD_COMMON
+#define I2C_CLIENT_INSMOD_2(chip1, chip2)                               \
+enum chips { any_chip, chip1, chip2 };                                  \
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
+                       "boldly assume to be present");                  \
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
+static unsigned short *forces[] = { force, force_##chip1,               \
+                                    force_##chip2, NULL };              \
+I2C_CLIENT_INSMOD_COMMON
+#define I2C_CLIENT_INSMOD_3(chip1, chip2, chip3)                        \
+enum chips { any_chip, chip1, chip2, chip3 };                           \
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
+                       "boldly assume to be present");                  \
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
+static unsigned short *forces[] = { force, force_##chip1,               \
+                                    force_##chip2, force_##chip3,       \
+                                    NULL };                             \
+I2C_CLIENT_INSMOD_COMMON
+#define I2C_CLIENT_INSMOD_4(chip1, chip2, chip3, chip4)                 \
+enum chips { any_chip, chip1, chip2, chip3, chip4 };                    \
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
+                       "boldly assume to be present");                  \
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
+static unsigned short *forces[] = { force, force_##chip1,               \
+                                    force_##chip2, force_##chip3,       \
+                                    force_##chip4, NULL};               \
+I2C_CLIENT_INSMOD_COMMON
+#define I2C_CLIENT_INSMOD_5(chip1, chip2, chip3, chip4, chip5)          \
+enum chips { any_chip, chip1, chip2, chip3, chip4, chip5 };             \
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
+                       "boldly assume to be present");                  \
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
+static unsigned short *forces[] = { force, force_##chip1,               \
+                                    force_##chip2, force_##chip3,       \
+                                    force_##chip4, force_##chip5,       \
+                                    NULL };                             \
+I2C_CLIENT_INSMOD_COMMON
+#define I2C_CLIENT_INSMOD_6(chip1, chip2, chip3, chip4, chip5, chip6)   \
+enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6 };      \
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
+                       "boldly assume to be present");                  \
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip6);                                    \
+static unsigned short *forces[] = { force, force_##chip1,               \
+                                    force_##chip2, force_##chip3,       \
+                                    force_##chip4, force_##chip5,       \
+                                    force_##chip6, NULL };              \
+I2C_CLIENT_INSMOD_COMMON
+#define I2C_CLIENT_INSMOD_7(chip1, chip2, chip3, chip4, chip5, chip6, chip7) \
+enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6,        \
+             chip7 };                                                   \
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
+                       "boldly assume to be present");                  \
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip6);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip7);                                    \
+static unsigned short *forces[] = { force, force_##chip1,               \
+                                    force_##chip2, force_##chip3,       \
+                                    force_##chip4, force_##chip5,       \
+                                    force_##chip6, force_##chip7,       \
+                                    NULL };                             \
+I2C_CLIENT_INSMOD_COMMON
+#define I2C_CLIENT_INSMOD_8(chip1, chip2, chip3, chip4, chip5, chip6, chip7, chip8) \
+enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6,        \
+             chip7, chip8 };                                            \
+I2C_CLIENT_MODULE_PARM(force, "List of adapter,address pairs to "       \
+                       "boldly assume to be present");                  \
+I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip6);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip7);                                    \
+I2C_CLIENT_MODULE_PARM_FORCE(chip8);                                    \
+static unsigned short *forces[] = { force, force_##chip1,               \
+                                    force_##chip2, force_##chip3,       \
+                                    force_##chip4, force_##chip5,       \
+                                    force_##chip6, force_##chip7,       \
+                                    force_##chip8, NULL };              \
+I2C_CLIENT_INSMOD_COMMON
 #endif /* _LINUX_I2C_H */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 92129078d4f3..a6dbb51ecd7b 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1501,4 +1501,10 @@ extern struct bus_type ide_bus_type;
 #define ide_id_has_flush_cache_ext(id)  \
        (((id)->cfs_enable_2 & 0x2400) == 0x2400)
+static inline int hwif_to_node(ide_hwif_t *hwif)
+{
+        struct pci_dev *dev = hwif->pci_dev;
+        return dev ? pcibus_to_node(dev->bus) : -1;
+}
 #endif /* _IDE_H */
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index b5b58e9c054c..fc2d4c8225aa 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -110,6 +110,8 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)
 {
        return (struct ethhdr *)skb->mac.raw;
 }
+extern struct ctl_table ether_table[];
 #endif
 #endif  /* _LINUX_IF_ETHER_H */
diff --git a/include/linux/if_fc.h b/include/linux/if_fc.h
index 33330b458b95..376a34ea4723 100644
--- a/include/linux/if_fc.h
+++ b/include/linux/if_fc.h
@@ -44,7 +44,7 @@ struct fcllc {
        __u8  ssap;                     /* source SAP */
        __u8  llc;                      /* LLC control field */
        __u8  protid[3];                /* protocol id */
-        __u16 ethertype;                /* ether type field */
+        __be16 ethertype;               /* ether type field */
 };
 #endif  /* _LINUX_IF_FC_H */
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index a912818e6361..1288a161bc0b 100644
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -85,7 +85,7 @@ struct fddi_snap_hdr
        __u8    ssap;                                   /* always 0xAA */
        __u8    ctrl;                                   /* always 0x03 */
        __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
-        __u16   ethertype;                              /* packet type ID field */
+        __be16  ethertype;                              /* packet type ID field */
        } __attribute__ ((packed));
 /* Define FDDI LLC frame header */
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 3c94b1736570..511999c7eeda 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -191,10 +191,12 @@ struct frad_local
   int               buffer;            /* current buffer for S508 firmware */
 };
-extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
 #endif /* __KERNEL__ */
 #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
+#ifdef __KERNEL__
+extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
+#endif
 #endif
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h
index c8ca72c46f76..94d31ca7d71a 100644
--- a/include/linux/if_hippi.h
+++ b/include/linux/if_hippi.h
@@ -102,9 +102,9 @@ struct hippi_fp_hdr
 #error  "Please fix <asm/byteorder.h>"
 #endif
 #else
-        __u32           fixed;
+        __be32          fixed;
 #endif
-        __u32           d2_size;
+        __be32          d2_size;
 } __attribute__ ((packed));
 struct hippi_le_hdr
@@ -144,7 +144,7 @@ struct hippi_snap_hdr
        __u8    ssap;                   /* always 0xAA */
        __u8    ctrl;                   /* always 0x03 */
        __u8    oui[HIPPI_OUI_LEN];     /* organizational universal id (zero)*/
-        __u16   ethertype;              /* packet type ID field */
+        __be16  ethertype;              /* packet type ID field */
 } __attribute__ ((packed));
 struct hippi_hdr
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h
index 3fba9e2f5427..5502f597cf0e 100644
--- a/include/linux/if_tr.h
+++ b/include/linux/if_tr.h
@@ -43,12 +43,16 @@ struct trh_hdr {
 };
 #ifdef __KERNEL__
+#include <linux/config.h>
 #include <linux/skbuff.h>
 static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb)
 {
        return (struct trh_hdr *)skb->mac.raw;
 }
+#ifdef CONFIG_SYSCTL
+extern struct ctl_table tr_table[];
+#endif
 #endif
 /* This is an Token-Ring LLC structure */
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 096a85a58ae5..88aef7b86ef4 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -77,6 +77,7 @@ struct tun_struct {
 #define TUNSETIFF     _IOW('T', 202, int) 
 #define TUNSETPERSIST _IOW('T', 203, int) 
 #define TUNSETOWNER   _IOW('T', 204, int)
+#define TUNSETLINK    _IOW('T', 205, int)
 /* TUNSETIFF ifr flags */
 #define IFF_TUN         0x0001
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 62a9d89dfbe2..17d0c0d40b0e 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -155,7 +155,6 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb,
 {
        struct net_device_stats *stats;
-        skb->real_dev = skb->dev;
        skb->dev = grp->vlan_devices[vlan_tag & VLAN_VID_MASK];
        if (skb->dev == NULL) {
                dev_kfree_skb_any(skb);
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 0c31ef0b5bad..28f4f3b36950 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -129,6 +129,9 @@ struct igmpv3_query {
 #include <linux/skbuff.h>
 #include <linux/in.h>
+extern int sysctl_igmp_max_memberships;
+extern int sysctl_igmp_max_msf;
 struct ip_sf_socklist
 {
        unsigned int            sl_max;
diff --git a/include/linux/in.h b/include/linux/in.h
index fb88c66d748d..ba355384016a 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -32,6 +32,7 @@ enum {
  IPPROTO_PUP = 12,             /* PUP protocol                         */
  IPPROTO_UDP = 17,             /* User Datagram Protocol               */
  IPPROTO_IDP = 22,             /* XNS IDP protocol                     */
+  IPPROTO_DCCP = 33,            /* Datagram Congestion Control Protocol */
  IPPROTO_RSVP = 46,            /* RSVP protocol                        */
  IPPROTO_GRE = 47,             /* Cisco GRE tunnels (rfc 1701,1702)    */
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
new file mode 100644
index 000000000000..a4606e5810e5
--- /dev/null
+++ b/include/linux/inet_diag.h
@@ -0,0 +1,138 @@
+#ifndef _INET_DIAG_H_
+#define _INET_DIAG_H_ 1
+/* Just some random number */
+#define TCPDIAG_GETSOCK 18
+#define DCCPDIAG_GETSOCK 19
+#define INET_DIAG_GETSOCK_MAX 24
+/* Socket identity */
+struct inet_diag_sockid {
+        __u16   idiag_sport;
+        __u16   idiag_dport;
+        __u32   idiag_src[4];
+        __u32   idiag_dst[4];
+        __u32   idiag_if;
+        __u32   idiag_cookie[2];
+#define INET_DIAG_NOCOOKIE (~0U)
+};
+/* Request structure */
+struct inet_diag_req {
+        __u8    idiag_family;           /* Family of addresses. */
+        __u8    idiag_src_len;
+        __u8    idiag_dst_len;
+        __u8    idiag_ext;              /* Query extended information */
+        struct inet_diag_sockid id;
+        __u32   idiag_states;           /* States to dump */
+        __u32   idiag_dbs;              /* Tables to dump (NI) */
+};
+enum {
+        INET_DIAG_REQ_NONE,
+        INET_DIAG_REQ_BYTECODE,
+};
+#define INET_DIAG_REQ_MAX INET_DIAG_REQ_BYTECODE
+/* Bytecode is sequence of 4 byte commands followed by variable arguments.
+ * All the commands identified by "code" are conditional jumps forward:
+ * to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
+ * length of the command and its arguments.
+ */
+ 
+struct inet_diag_bc_op {
+        unsigned char   code;
+        unsigned char   yes;
+        unsigned short  no;
+};
+enum {
+        INET_DIAG_BC_NOP,
+        INET_DIAG_BC_JMP,
+        INET_DIAG_BC_S_GE,
+        INET_DIAG_BC_S_LE,
+        INET_DIAG_BC_D_GE,
+        INET_DIAG_BC_D_LE,
+        INET_DIAG_BC_AUTO,
+        INET_DIAG_BC_S_COND,
+        INET_DIAG_BC_D_COND,
+};
+struct inet_diag_hostcond {
+        __u8    family;
+        __u8    prefix_len;
+        int     port;
+        __u32   addr[0];
+};
+/* Base info structure. It contains socket identity (addrs/ports/cookie)
+ * and, alas, the information shown by netstat. */
+struct inet_diag_msg {
+        __u8    idiag_family;
+        __u8    idiag_state;
+        __u8    idiag_timer;
+        __u8    idiag_retrans;
+        struct inet_diag_sockid id;
+        __u32   idiag_expires;
+        __u32   idiag_rqueue;
+        __u32   idiag_wqueue;
+        __u32   idiag_uid;
+        __u32   idiag_inode;
+};
+/* Extensions */
+enum {
+        INET_DIAG_NONE,
+        INET_DIAG_MEMINFO,
+        INET_DIAG_INFO,
+        INET_DIAG_VEGASINFO,
+        INET_DIAG_CONG,
+};
+#define INET_DIAG_MAX INET_DIAG_CONG
+/* INET_DIAG_MEM */
+struct inet_diag_meminfo {
+        __u32   idiag_rmem;
+        __u32   idiag_wmem;
+        __u32   idiag_fmem;
+        __u32   idiag_tmem;
+};
+/* INET_DIAG_VEGASINFO */
+struct tcpvegas_info {
+        __u32   tcpv_enabled;
+        __u32   tcpv_rttcnt;
+        __u32   tcpv_rtt;
+        __u32   tcpv_minrtt;
+};
+#ifdef __KERNEL__
+struct sock;
+struct inet_hashinfo;
+struct inet_diag_handler {
+        struct inet_hashinfo    *idiag_hashinfo;
+        void                    (*idiag_get_info)(struct sock *sk,
+                                                  struct inet_diag_msg *r,
+                                                  void *info);
+        __u16                   idiag_info_size;
+        __u16                   idiag_type;
+};
+extern int  inet_diag_register(const struct inet_diag_handler *handler);
+extern void inet_diag_unregister(const struct inet_diag_handler *handler);
+#endif /* __KERNEL__ */
+#endif /* _INET_DIAG_H_ */
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
new file mode 100644
index 000000000000..93bb3afe646b
--- /dev/null
+++ b/include/linux/inotify.h
@@ -0,0 +1,110 @@
+/*
+ * Inode based directory notification for Linux
+ *
+ * Copyright (C) 2005 John McCutchan
+ */
+#ifndef _LINUX_INOTIFY_H
+#define _LINUX_INOTIFY_H
+#include <linux/types.h>
+/*
+ * struct inotify_event - structure read from the inotify device for each event
+ *
+ * When you are watching a directory, you will receive the filename for events
+ * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
+ */
+struct inotify_event {
+        __s32           wd;             /* watch descriptor */
+        __u32           mask;           /* watch mask */
+        __u32           cookie;         /* cookie to synchronize two events */
+        __u32           len;            /* length (including nulls) of name */
+        char            name[0];        /* stub for possible name */
+};
+/* the following are legal, implemented events that user-space can watch for */
+#define IN_ACCESS               0x00000001      /* File was accessed */
+#define IN_MODIFY               0x00000002      /* File was modified */
+#define IN_ATTRIB               0x00000004      /* Metadata changed */
+#define IN_CLOSE_WRITE          0x00000008      /* Writtable file was closed */
+#define IN_CLOSE_NOWRITE        0x00000010      /* Unwrittable file closed */
+#define IN_OPEN                 0x00000020      /* File was opened */
+#define IN_MOVED_FROM           0x00000040      /* File was moved from X */
+#define IN_MOVED_TO             0x00000080      /* File was moved to Y */
+#define IN_CREATE               0x00000100      /* Subfile was created */
+#define IN_DELETE               0x00000200      /* Subfile was deleted */
+#define IN_DELETE_SELF          0x00000400      /* Self was deleted */
+#define IN_MOVE_SELF            0x00000800      /* Self was moved */
+/* the following are legal events.  they are sent as needed to any watch */
+#define IN_UNMOUNT              0x00002000      /* Backing fs was unmounted */
+#define IN_Q_OVERFLOW           0x00004000      /* Event queued overflowed */
+#define IN_IGNORED              0x00008000      /* File was ignored */
+/* helper events */
+#define IN_CLOSE                (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */
+#define IN_MOVE                 (IN_MOVED_FROM | IN_MOVED_TO) /* moves */
+/* special flags */
+#define IN_ISDIR                0x40000000      /* event occurred against dir */
+#define IN_ONESHOT              0x80000000      /* only send event once */
+/*
+ * All of the events - we build the list by hand so that we can add flags in
+ * the future and not break backward compatibility.  Apps will get only the
+ * events that they originally wanted.  Be sure to add new events here!
+ */
+#define IN_ALL_EVENTS   (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
+                         IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
+                         IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
+                         IN_MOVE_SELF)
+#ifdef __KERNEL__
+#include <linux/dcache.h>
+#include <linux/fs.h>
+#include <linux/config.h>
+#ifdef CONFIG_INOTIFY
+extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
+                                      const char *);
+extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
+                                              const char *);
+extern void inotify_unmount_inodes(struct list_head *);
+extern void inotify_inode_is_dead(struct inode *);
+extern u32 inotify_get_cookie(void);
+#else
+static inline void inotify_inode_queue_event(struct inode *inode,
+                                             __u32 mask, __u32 cookie,
+                                             const char *filename)
+{
+}
+static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
+                                                     __u32 mask, __u32 cookie,
+                                                     const char *filename)
+{
+}
+static inline void inotify_unmount_inodes(struct list_head *list)
+{
+}
+static inline void inotify_inode_is_dead(struct inode *inode)
+{
+}
+static inline u32 inotify_get_cookie(void)
+{
+        return 0;
+}
+#endif  /* CONFIG_INOTIFY */
+#endif  /* __KERNEL __ */
+#endif  /* _LINUX_INOTIFY_H */
diff --git a/include/linux/input.h b/include/linux/input.h
index b9cc0ac71f44..bdc53c6cc962 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -811,9 +811,9 @@ struct input_dev {
        void *private;
-        char *name;
+        const char *name;
-        char *phys;
+        const char *phys;
-        char *uniq;
+        const char *uniq;
        struct input_id id;
        unsigned long evbit[NBITS(EV_MAX)];
diff --git a/include/linux/ip.h b/include/linux/ip.h
index 31e7cedd9f84..33e8a19a1a0f 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -196,6 +196,8 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
 #endif
 #endif
+extern int inet_sk_rebuild_header(struct sock *sk);
 struct iphdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        __u8    ihl:4,
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 6fcd6a0ade24..3c7dbc6a0a70 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -193,6 +193,11 @@ struct inet6_skb_parm {
 #define IP6CB(skb)      ((struct inet6_skb_parm*)((skb)->cb))
+static inline int inet6_iif(const struct sk_buff *skb)
+{
+        return IP6CB(skb)->iif;
+}
 struct tcp6_request_sock {
        struct tcp_request_sock req;
        struct in6_addr         loc_addr;
@@ -308,6 +313,36 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
 #define __ipv6_only_sock(sk)    (inet6_sk(sk)->ipv6only)
 #define ipv6_only_sock(sk)      ((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))
+#include <linux/tcp.h>
+struct tcp6_timewait_sock {
+        struct tcp_timewait_sock tw_v6_sk;
+        struct in6_addr          tw_v6_daddr;
+        struct in6_addr          tw_v6_rcv_saddr;
+};
+static inline struct tcp6_timewait_sock *tcp6_twsk(const struct sock *sk)
+{
+        return (struct tcp6_timewait_sock *)sk;
+}
+static inline struct in6_addr *__tcp_v6_rcv_saddr(const struct sock *sk)
+{
+        return likely(sk->sk_state != TCP_TIME_WAIT) ?
+                &inet6_sk(sk)->rcv_saddr : &tcp6_twsk(sk)->tw_v6_rcv_saddr;
+}
+static inline struct in6_addr *tcp_v6_rcv_saddr(const struct sock *sk)
+{
+        return sk->sk_family == AF_INET6 ? __tcp_v6_rcv_saddr(sk) : NULL;
+}
+static inline int inet_v6_ipv6only(const struct sock *sk)
+{
+        return likely(sk->sk_state != TCP_TIME_WAIT) ?
+                ipv6_only_sock(sk) : inet_twsk(sk)->tw_ipv6only;
+}
 #else
 #define __ipv6_only_sock(sk)    0
 #define ipv6_only_sock(sk)      0
@@ -322,8 +357,19 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk)
        return NULL;
 }
-#endif
+#define __tcp_v6_rcv_saddr(__sk)        NULL
+#define tcp_v6_rcv_saddr(__sk)          NULL
+#define tcp_twsk_ipv6only(__sk)         0
+#define inet_v6_ipv6only(__sk)          0
+#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
-#endif
+#define INET6_MATCH(__sk, __saddr, __daddr, __ports, __dif)        \
+        (((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   && \
+         ((__sk)->sk_family             == AF_INET6)            && \
+         ipv6_addr_equal(&inet6_sk(__sk)->daddr, (__saddr))     && \
+         ipv6_addr_equal(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \
+         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
-#endif
+#endif /* __KERNEL__ */
+#endif /* _IPV6_H */
diff --git a/include/linux/klist.h b/include/linux/klist.h
index eebf5e5696ec..c4d1fae4dd89 100644
--- a/include/linux/klist.h
+++ b/include/linux/klist.h
@@ -9,6 +9,9 @@
 *      This file is rleased under the GPL v2.
 */
+#ifndef _LINUX_KLIST_H
+#define _LINUX_KLIST_H
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/kref.h>
@@ -31,8 +34,8 @@ struct klist_node {
        struct completion       n_removed;
 };
-extern void klist_add_tail(struct klist * k, struct klist_node * n);
+extern void klist_add_tail(struct klist_node * n, struct klist * k);
-extern void klist_add_head(struct klist * k, struct klist_node * n);
+extern void klist_add_head(struct klist_node * n, struct klist * k);
 extern void klist_del(struct klist_node * n);
 extern void klist_remove(struct klist_node * n);
@@ -53,3 +56,4 @@ extern void klist_iter_init_node(struct klist * k, struct klist_iter * i,
 extern void klist_iter_exit(struct klist_iter * i);
 extern struct klist_node * klist_next(struct klist_iter * i);
+#endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 6cd9ba63563b..022105c745fc 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1,23 +1,26 @@
 /*
-   Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
+ *  Copyright 2003-2005 Red Hat, Inc.  All rights reserved.
-   Copyright 2003-2004 Jeff Garzik
+ *  Copyright 2003-2005 Jeff Garzik
+ *
-   The contents of this file are subject to the Open
+ *
-   Software License version 1.1 that can be found at
+ *  This program is free software; you can redistribute it and/or modify
-   http://www.opensource.org/licenses/osl-1.1.txt and is included herein
+ *  it under the terms of the GNU General Public License as published by
-   by reference.
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
-   Alternatively, the contents of this file may be used under the terms
+ *
-   of the GNU General Public License version 2 (the "GPL") as distributed
+ *  This program is distributed in the hope that it will be useful,
-   in the kernel source COPYING file, in which case the provisions of
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   the GPL are applicable instead of the above.  If you wish to allow
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   the use of your version of this file only under the terms of the
+ *  GNU General Public License for more details.
-   GPL and not to allow others to use your version of this file under
+ *
-   the OSL, indicate your decision by deleting the provisions above and
+ *  You should have received a copy of the GNU General Public License
-   replace them with the notice and other provisions required by the GPL.
+ *  along with this program; see the file COPYING.  If not, write to
-   If you do not delete the provisions above, a recipient may use your
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-   version of this file under either the OSL or the GPL.
+ *
+ *
+ *  libata documentation is available via 'make {ps|pdf}docs',
+ *  as Documentation/DocBook/libata.*
+ *
 */
 #ifndef __LINUX_LIBATA_H__
@@ -37,7 +40,6 @@
 #undef ATA_VERBOSE_DEBUG        /* yet more debugging output */
 #undef ATA_IRQ_TRAP             /* define to ack screaming irqs */
 #undef ATA_NDEBUG               /* define to disable quick runtime checks */
-#undef ATA_ENABLE_ATAPI         /* define to enable ATAPI support */
 #undef ATA_ENABLE_PATA          /* define to enable PATA support in some
                                 * low-level drivers */
 #undef ATAPI_ENABLE_DMADIR      /* enables ATAPI DMADIR bridge support */
@@ -113,6 +115,8 @@ enum {
        ATA_FLAG_MMIO           = (1 << 6), /* use MMIO, not PIO */
        ATA_FLAG_SATA_RESET     = (1 << 7), /* use COMRESET */
        ATA_FLAG_PIO_DMA        = (1 << 8), /* PIO cmds via DMA */
+        ATA_FLAG_NOINTR         = (1 << 9), /* FIXME: Remove this once
+                                             * proper HSM is in place. */
        ATA_QCFLAG_ACTIVE       = (1 << 1), /* cmd not yet ack'd to scsi lyer */
        ATA_QCFLAG_SG           = (1 << 3), /* have s/g table? */
@@ -363,7 +367,7 @@ struct ata_port_operations {
        void (*host_stop) (struct ata_host_set *host_set);
-        void (*bmdma_stop) (struct ata_port *ap);
+        void (*bmdma_stop) (struct ata_queued_cmd *qc);
        u8   (*bmdma_status) (struct ata_port *ap);
 };
@@ -424,7 +428,7 @@ extern void ata_dev_id_string(u16 *id, unsigned char *s,
 extern void ata_dev_config(struct ata_port *ap, unsigned int i);
 extern void ata_bmdma_setup (struct ata_queued_cmd *qc);
 extern void ata_bmdma_start (struct ata_queued_cmd *qc);
-extern void ata_bmdma_stop(struct ata_port *ap);
+extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
 extern u8   ata_bmdma_status(struct ata_port *ap);
 extern void ata_bmdma_irq_clear(struct ata_port *ap);
 extern void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat);
@@ -445,6 +449,7 @@ struct pci_bits {
        unsigned long           val;
 };
+extern void ata_pci_host_stop (struct ata_host_set *host_set);
 extern struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port);
 extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits);
@@ -644,7 +649,7 @@ static inline void scr_write(struct ata_port *ap, unsigned int reg, u32 val)
        ap->ops->scr_write(ap, reg, val);
 }
-static inline void scr_write_flush(struct ata_port *ap, unsigned int reg, 
+static inline void scr_write_flush(struct ata_port *ap, unsigned int reg,
                                   u32 val)
 {
        ap->ops->scr_write(ap, reg, val);
diff --git a/include/linux/list.h b/include/linux/list.h
index aab2db21b013..e6ec59682274 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -419,6 +419,20 @@ static inline void list_splice_init(struct list_head *list,
             pos = n, n = list_entry(n->member.next, typeof(*n), member))
 /**
+ * list_for_each_entry_safe_continue -  iterate over list of given type
+ *                      continuing after existing point safe against removal of list entry
+ * @pos:        the type * to use as a loop counter.
+ * @n:          another type * to use as temporary storage
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_safe_continue(pos, n, head, member)                 \
+        for (pos = list_entry(pos->member.next, typeof(*pos), member),          \
+                n = list_entry(pos->member.next, typeof(*pos), member);         \
+             &pos->member != (head);                                            \
+             pos = n, n = list_entry(n->member.next, typeof(*n), member))
+/**
 * list_for_each_rcu    -       iterate over an rcu-protected list
 * @pos:        the &struct list_head to use as a loop counter.
 * @head:       the head for your list.
@@ -620,6 +634,57 @@ static inline void hlist_add_after(struct hlist_node *n,
                next->next->pprev  = &next->next;
 }
+/**
+ * hlist_add_before_rcu - adds the specified element to the specified hlist
+ * before the specified node while permitting racing traversals.
+ * @n: the new element to add to the hash list.
+ * @next: the existing element to add the new element before.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_rcu(), used to prevent memory-consistency
+ * problems on Alpha CPUs.
+ */
+static inline void hlist_add_before_rcu(struct hlist_node *n,
+                                        struct hlist_node *next)
+{
+        n->pprev = next->pprev;
+        n->next = next;
+        smp_wmb();
+        next->pprev = &n->next;
+        *(n->pprev) = n;
+}
+/**
+ * hlist_add_after_rcu - adds the specified element to the specified hlist
+ * after the specified node while permitting racing traversals.
+ * @prev: the existing element to add the new element after.
+ * @n: the new element to add to the hash list.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_rcu(), used to prevent memory-consistency
+ * problems on Alpha CPUs.
+ */
+static inline void hlist_add_after_rcu(struct hlist_node *prev,
+                                       struct hlist_node *n)
+{
+        n->next = prev->next;
+        n->pprev = &prev->next;
+        smp_wmb();
+        prev->next = n;
+        if (n->next)
+                n->next->pprev = &n->next;
+}
 #define hlist_entry(ptr, type, member) container_of(ptr,type,member)
 #define hlist_for_each(pos, head) \
diff --git a/include/linux/mbcache.h b/include/linux/mbcache.h
index 8e5a10410a30..9263d2db2d67 100644
--- a/include/linux/mbcache.h
+++ b/include/linux/mbcache.h
@@ -29,7 +29,7 @@ struct mb_cache_op {
 struct mb_cache * mb_cache_create(const char *, struct mb_cache_op *, size_t,
                                  int, int);
-void mb_cache_shrink(struct mb_cache *, struct block_device *);
+void mb_cache_shrink(struct block_device *);
 void mb_cache_destroy(struct mb_cache *);
 /* Functions on cache entries */
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 8480aef10e62..94a46f38c532 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -150,6 +150,9 @@ void mpol_free_shared_policy(struct shared_policy *p);
 struct mempolicy *mpol_shared_policy_lookup(struct shared_policy *sp,
                                            unsigned long idx);
+struct mempolicy *get_vma_policy(struct task_struct *task,
+                        struct vm_area_struct *vma, unsigned long addr);
 extern void numa_default_policy(void);
 extern void numa_policy_init(void);
diff --git a/include/linux/mii.h b/include/linux/mii.h
index 374b615ea9ea..9b8d0476988a 100644
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -22,6 +22,7 @@
 #define MII_EXPANSION       0x06        /* Expansion register          */
 #define MII_CTRL1000        0x09        /* 1000BASE-T control          */
 #define MII_STAT1000        0x0a        /* 1000BASE-T status           */
+#define MII_ESTATUS         0x0f        /* Extended Status */
 #define MII_DCOUNTER        0x12        /* Disconnect counter          */
 #define MII_FCSCOUNTER      0x13        /* False carrier counter       */
 #define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
@@ -54,7 +55,10 @@
 #define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
 #define BMSR_RFAULT             0x0010  /* Remote fault detected       */
 #define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
-#define BMSR_RESV               0x07c0  /* Unused...                   */
+#define BMSR_RESV               0x00c0  /* Unused...                   */
+#define BMSR_ESTATEN            0x0100  /* Extended Status in R15 */
+#define BMSR_100FULL2           0x0200  /* Can do 100BASE-T2 HDX */
+#define BMSR_100HALF2           0x0400  /* Can do 100BASE-T2 FDX */
 #define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
 #define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
 #define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
@@ -114,6 +118,9 @@
 #define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
 #define EXPANSION_RESV          0xffe0  /* Unused...                   */
+#define ESTATUS_1000_TFULL      0x2000  /* Can do 1000BT Full */
+#define ESTATUS_1000_THALF      0x1000  /* Can do 1000BT Half */
 /* N-way test register. */
 #define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
 #define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6eb7f48317f8..82d7024f0765 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -625,10 +625,16 @@ static inline int page_mapped(struct page *page)
 * Used to decide whether a process gets delivered SIGBUS or
 * just gets major/minor fault counters bumped up.
 */
-#define VM_FAULT_OOM    (-1)
+#define VM_FAULT_OOM    0x00
-#define VM_FAULT_SIGBUS 0
+#define VM_FAULT_SIGBUS 0x01
-#define VM_FAULT_MINOR  1
+#define VM_FAULT_MINOR  0x02
-#define VM_FAULT_MAJOR  2
+#define VM_FAULT_MAJOR  0x03
+/* 
+ * Special case for get_user_pages.
+ * Must be in a distinct bit from the above VM_FAULT_ flags.
+ */
+#define VM_FAULT_WRITE  0x10
 #define offset_in_page(p)       ((unsigned long)(p) & ~PAGE_MASK)
@@ -704,7 +710,13 @@ extern pte_t *FASTCALL(pte_alloc_kernel(struct mm_struct *mm, pmd_t *pmd, unsign
 extern pte_t *FASTCALL(pte_alloc_map(struct mm_struct *mm, pmd_t *pmd, unsigned long address));
 extern int install_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, struct page *page, pgprot_t prot);
 extern int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, unsigned long pgoff, pgprot_t prot);
-extern int handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access);
+extern int __handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access);
+static inline int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, int write_access)
+{
+        return __handle_mm_fault(mm, vma, address, write_access) & (~VM_FAULT_WRITE);
+}
 extern int make_pages_present(unsigned long addr, unsigned long end);
 extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
 void install_arg_page(struct vm_area_struct *, struct page *, unsigned long);
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f90f674eb3b0..30f68c0c8c6e 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -46,6 +46,12 @@ struct mmc_ios {
 #define MMC_BUSMODE_OPENDRAIN   1
 #define MMC_BUSMODE_PUSHPULL    2
+        unsigned char   chip_select;            /* SPI chip select */
+#define MMC_CS_DONTCARE         0
+#define MMC_CS_HIGH             1
+#define MMC_CS_LOW              2
        unsigned char   power_mode;             /* power supply mode */
 #define MMC_POWER_OFF           0
@@ -63,11 +69,12 @@ struct device;
 struct mmc_host {
        struct device           *dev;
+        struct class_device     class_dev;
+        int                     index;
        struct mmc_host_ops     *ops;
        unsigned int            f_min;
        unsigned int            f_max;
        u32                     ocr_avail;
-        char                    host_name[8];
        /* host specific block data */
        unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
@@ -97,6 +104,7 @@ extern void mmc_free_host(struct mmc_host *);
 #define mmc_priv(x)     ((void *)((x) + 1))
 #define mmc_dev(x)      ((x)->dev)
+#define mmc_hostname(x) ((x)->class_dev.class_id)
 extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
 extern int mmc_resume_host(struct mmc_host *);
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 6c90461ed99f..5ed471b58f4f 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -487,11 +487,27 @@ struct mem_section {
        unsigned long section_mem_map;
 };
-extern struct mem_section mem_section[NR_MEM_SECTIONS];
+#ifdef CONFIG_SPARSEMEM_EXTREME
+#define SECTIONS_PER_ROOT       (PAGE_SIZE / sizeof (struct mem_section))
+#else
+#define SECTIONS_PER_ROOT       1
+#endif
+#define SECTION_NR_TO_ROOT(sec) ((sec) / SECTIONS_PER_ROOT)
+#define NR_SECTION_ROOTS        (NR_MEM_SECTIONS / SECTIONS_PER_ROOT)
+#define SECTION_ROOT_MASK       (SECTIONS_PER_ROOT - 1)
+#ifdef CONFIG_SPARSEMEM_EXTREME
+extern struct mem_section *mem_section[NR_SECTION_ROOTS];
+#else
+extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
+#endif
 static inline struct mem_section *__nr_to_section(unsigned long nr)
 {
-        return &mem_section[nr];
+        if (!mem_section[SECTION_NR_TO_ROOT(nr)])
+                return NULL;
+        return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
 }
 /*
@@ -513,12 +529,12 @@ static inline struct page *__section_mem_map_addr(struct mem_section *section)
 static inline int valid_section(struct mem_section *section)
 {
-        return (section->section_mem_map & SECTION_MARKED_PRESENT);
+        return (section && (section->section_mem_map & SECTION_MARKED_PRESENT));
 }
 static inline int section_has_mem_map(struct mem_section *section)
 {
-        return (section->section_mem_map & SECTION_HAS_MEM_MAP);
+        return (section && (section->section_mem_map & SECTION_HAS_MEM_MAP));
 }
 static inline int valid_section_nr(unsigned long nr)
@@ -572,6 +588,7 @@ static inline int pfn_valid(unsigned long pfn)
 void sparse_init(void);
 #else
 #define sparse_init()   do {} while (0)
+#define sparse_index_init(_sec, _nid)  do {} while (0)
 #endif /* CONFIG_SPARSEMEM */
 #ifdef CONFIG_NODES_SPAN_OTHER_NODES
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index dce53ac1625d..47da39ba3f03 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -1,6 +1,6 @@
 /*
 * Device tables which are exported to userspace via
- * scripts/table2alias.c.  You must keep that file in sync with this
+ * scripts/mod/file2alias.c.  You must keep that file in sync with this
 * header.
 */
@@ -33,7 +33,8 @@ struct ieee1394_device_id {
        __u32 model_id;
        __u32 specifier_id;
        __u32 version;
-        kernel_ulong_t driver_data;
+        kernel_ulong_t driver_data
+                __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
@@ -182,9 +183,18 @@ struct of_device_id
        char    name[32];
        char    type[32];
        char    compatible[128];
+#if __KERNEL__
        void    *data;
+#else
+        kernel_ulong_t data;
+#endif
 };
+/* VIO */
+struct vio_device_id {
+        char type[32];
+        char compat[32];
+};
 /* PCMCIA */
@@ -208,7 +218,8 @@ struct pcmcia_device_id {
 #ifdef __KERNEL__
        const char *    prod_id[4];
 #else
-        kernel_ulong_t  prod_id[4];
+        kernel_ulong_t  prod_id[4]
+                __attribute__((aligned(sizeof(kernel_ulong_t))));
 #endif
        /* not matched against */
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 74b4727a4e30..f8f39937e301 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -12,6 +12,7 @@
 #define _LINUX_MOUNT_H
 #ifdef __KERNEL__
+#include <linux/types.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
@@ -76,6 +77,7 @@ extern int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
 extern void mark_mounts_for_expiry(struct list_head *mounts);
 extern spinlock_t vfsmount_lock;
+extern dev_t name_to_dev_t(char *name);
 #endif
 #endif /* _LINUX_MOUNT_H */
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index 5773ea42f6e4..0b08cd692201 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -980,7 +980,7 @@
 /* I2C Registers                        */
 /****************************************/
-#define MV64XXX_I2C_CTLR_NAME                                   "mv64xxx i2c"
+#define MV64XXX_I2C_CTLR_NAME                                   "mv64xxx_i2c"
 #define MV64XXX_I2C_OFFSET                                          0xc000
 #define MV64XXX_I2C_REG_BLOCK_SIZE                                  0x0020
diff --git a/include/linux/net.h b/include/linux/net.h
index 20cb226b2268..4e981585a89a 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -84,6 +84,7 @@ enum sock_type {
        SOCK_RAW        = 3,
        SOCK_RDM        = 4,
        SOCK_SEQPACKET  = 5,
+        SOCK_DCCP       = 6,
        SOCK_PACKET     = 10,
 };
@@ -282,5 +283,15 @@ static struct proto_ops name##_ops = {			\
 #define MODULE_ALIAS_NETPROTO(proto) \
        MODULE_ALIAS("net-pf-" __stringify(proto))
+#define MODULE_ALIAS_NET_PF_PROTO(pf, proto) \
+        MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto))
+#ifdef CONFIG_SYSCTL
+#include <linux/sysctl.h>
+extern ctl_table net_table[];
+extern int net_msg_cost;
+extern int net_msg_burst;
+#endif
 #endif /* __KERNEL__ */
 #endif  /* _LINUX_NET_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3a0ed7f9e801..7c717907896d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -244,6 +244,7 @@ struct netdev_boot_setup {
 };
 #define NETDEV_BOOT_SETUP_MAX 8
+extern int __init netdev_boot_setup(char *str);
 /*
 *      The DEVICE structure.
@@ -336,6 +337,7 @@ struct net_device
        /* Interface address info. */
        unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
        unsigned char           dev_addr[MAX_ADDR_LEN]; /* hw address   */
+        unsigned char           perm_addr[MAX_ADDR_LEN]; /* permanent hw address */
        unsigned char           addr_len;       /* hardware address length      */
        unsigned short          dev_id;         /* for shared network cards */
@@ -497,10 +499,12 @@ static inline void *netdev_priv(struct net_device *dev)
 #define SET_NETDEV_DEV(net, pdev)       ((net)->class_dev.dev = (pdev))
 struct packet_type {
-        __be16                  type;   /* This is really htons(ether_type).    */
+        __be16                  type;   /* This is really htons(ether_type). */
-        struct net_device               *dev;   /* NULL is wildcarded here              */
+        struct net_device       *dev;   /* NULL is wildcarded here           */
-        int                     (*func) (struct sk_buff *, struct net_device *,
+        int                     (*func) (struct sk_buff *,
-                                         struct packet_type *);
+                                         struct net_device *,
+                                         struct packet_type *,
+                                         struct net_device *);
        void                    *af_packet_priv;
        struct list_head        list;
 };
@@ -671,6 +675,7 @@ extern void		dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev);
 extern void             dev_init(void);
 extern int              netdev_nit;
+extern int              netdev_budget;
 /* Called by rtnetlink.c:rtnl_unlock() */
 extern void netdev_run_todo(void);
@@ -697,19 +702,9 @@ static inline int netif_carrier_ok(const struct net_device *dev)
 extern void __netdev_watchdog_up(struct net_device *dev);
-static inline void netif_carrier_on(struct net_device *dev)
+extern void netif_carrier_on(struct net_device *dev);
-{
-        if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state))
-                linkwatch_fire_event(dev);
-        if (netif_running(dev))
-                __netdev_watchdog_up(dev);
-}
-static inline void netif_carrier_off(struct net_device *dev)
+extern void netif_carrier_off(struct net_device *dev);
-{
-        if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
-                linkwatch_fire_event(dev);
-}
 /* Hot-plugging. */
 static inline int netif_device_present(struct net_device *dev)
@@ -916,6 +911,14 @@ extern int skb_checksum_help(struct sk_buff *skb, int inward);
 extern void             net_enable_timestamp(void);
 extern void             net_disable_timestamp(void);
+#ifdef CONFIG_PROC_FS
+extern void *dev_seq_start(struct seq_file *seq, loff_t *pos);
+extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
+extern void dev_seq_stop(struct seq_file *seq, void *v);
+#endif
+extern void linkwatch_run_queue(void);
 #endif /* __KERNEL__ */
 #endif  /* _LINUX_DEV_H */
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 2e2045482cb1..be365e70ee99 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -21,10 +21,23 @@
 #define NF_STOP 5
 #define NF_MAX_VERDICT NF_STOP
+/* we overload the higher bits for encoding auxiliary data such as the queue
+ * number. Not nice, but better than additional function arguments. */
+#define NF_VERDICT_MASK 0x0000ffff
+#define NF_VERDICT_BITS 16
+#define NF_VERDICT_QMASK 0xffff0000
+#define NF_VERDICT_QBITS 16
+#define NF_QUEUE_NR(x) (((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK) | NF_QUEUE)
+/* only for userspace compatibility */
+#ifndef __KERNEL__
 /* Generic cache responses from hook functions.
   <= 0x2000 is used for protocol-flags. */
 #define NFC_UNKNOWN 0x4000
 #define NFC_ALTERED 0x8000
+#endif
 #ifdef __KERNEL__
 #include <linux/config.h>
@@ -101,15 +114,51 @@ void nf_unregister_sockopt(struct nf_sockopt_ops *reg);
 extern struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];
-typedef void nf_logfn(unsigned int hooknum,
+/* those NF_LOG_* defines and struct nf_loginfo are legacy definitios that will
+ * disappear once iptables is replaced with pkttables.  Please DO NOT use them
+ * for any new code! */
+#define NF_LOG_TCPSEQ           0x01    /* Log TCP sequence numbers */
+#define NF_LOG_TCPOPT           0x02    /* Log TCP options */
+#define NF_LOG_IPOPT            0x04    /* Log IP options */
+#define NF_LOG_UID              0x08    /* Log UID owning local socket */
+#define NF_LOG_MASK             0x0f
+#define NF_LOG_TYPE_LOG         0x01
+#define NF_LOG_TYPE_ULOG        0x02
+struct nf_loginfo {
+        u_int8_t type;
+        union {
+                struct {
+                        u_int32_t copy_len;
+                        u_int16_t group;
+                        u_int16_t qthreshold;
+                } ulog;
+                struct {
+                        u_int8_t level;
+                        u_int8_t logflags;
+                } log;
+        } u;
+};
+typedef void nf_logfn(unsigned int pf,
+                      unsigned int hooknum,
                      const struct sk_buff *skb,
                      const struct net_device *in,
                      const struct net_device *out,
+                      const struct nf_loginfo *li,
                      const char *prefix);
+struct nf_logger {
+        struct module   *me;
+        nf_logfn        *logfn;
+        char            *name;
+};
 /* Function to register/unregister log function. */
-int nf_log_register(int pf, nf_logfn *logfn);
+int nf_log_register(int pf, struct nf_logger *logger);
-void nf_log_unregister(int pf, nf_logfn *logfn);
+int nf_log_unregister_pf(int pf);
+void nf_log_unregister_logger(struct nf_logger *logger);
 /* Calls the registered backend logging function */
 void nf_log_packet(int pf,
@@ -117,6 +166,7 @@ void nf_log_packet(int pf,
                   const struct sk_buff *skb,
                   const struct net_device *in,
                   const struct net_device *out,
+                   struct nf_loginfo *li,
                   const char *fmt, ...);
                   
 /* Activate hook; either okfn or kfree_skb called, unless a hook
@@ -175,11 +225,16 @@ int nf_getsockopt(struct sock *sk, int pf, int optval, char __user *opt,
                  int *len);
 /* Packet queuing */
-typedef int (*nf_queue_outfn_t)(struct sk_buff *skb, 
+struct nf_queue_handler {
-                                struct nf_info *info, void *data);
+        int (*outfn)(struct sk_buff *skb, struct nf_info *info,
+                     unsigned int queuenum, void *data);
+        void *data;
+        char *name;
+};
 extern int nf_register_queue_handler(int pf, 
-                                     nf_queue_outfn_t outfn, void *data);
+                                     struct nf_queue_handler *qh);
 extern int nf_unregister_queue_handler(int pf);
+extern void nf_unregister_queue_handlers(struct nf_queue_handler *qh);
 extern void nf_reinject(struct sk_buff *skb,
                        struct nf_info *info,
                        unsigned int verdict);
@@ -190,6 +245,27 @@ extern void nf_ct_attach(struct sk_buff *, struct sk_buff *);
 /* FIXME: Before cache is ever used, this must be implemented for real. */
 extern void nf_invalidate_cache(int pf);
+/* Call this before modifying an existing packet: ensures it is
+   modifiable and linear to the point you care about (writable_len).
+   Returns true or false. */
+extern int skb_make_writable(struct sk_buff **pskb, unsigned int writable_len);
+struct nf_queue_rerouter {
+        void (*save)(const struct sk_buff *skb, struct nf_info *info);
+        int (*reroute)(struct sk_buff **skb, const struct nf_info *info);
+        int rer_size;
+};
+#define nf_info_reroute(x) ((void *)x + sizeof(struct nf_info))
+extern int nf_register_queue_rerouter(int pf, struct nf_queue_rerouter *rer);
+extern int nf_unregister_queue_rerouter(int pf);
+#ifdef CONFIG_PROC_FS
+#include <linux/proc_fs.h>
+extern struct proc_dir_entry *proc_net_netfilter;
+#endif
 #else /* !CONFIG_NETFILTER */
 #define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)
 static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {}
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
new file mode 100644
index 000000000000..1d5b10ae2399
--- /dev/null
+++ b/include/linux/netfilter/nfnetlink.h
@@ -0,0 +1,169 @@
+#ifndef _NFNETLINK_H
+#define _NFNETLINK_H
+#include <linux/types.h>
+#ifndef __KERNEL__
+/* nfnetlink groups: Up to 32 maximum - backwards compatibility for userspace */
+#define NF_NETLINK_CONNTRACK_NEW                0x00000001
+#define NF_NETLINK_CONNTRACK_UPDATE             0x00000002
+#define NF_NETLINK_CONNTRACK_DESTROY            0x00000004
+#define NF_NETLINK_CONNTRACK_EXP_NEW            0x00000008
+#define NF_NETLINK_CONNTRACK_EXP_UPDATE         0x00000010
+#define NF_NETLINK_CONNTRACK_EXP_DESTROY        0x00000020
+#endif
+enum nfnetlink_groups {
+        NFNLGRP_NONE,
+#define NFNLGRP_NONE                    NFNLGRP_NONE
+        NFNLGRP_CONNTRACK_NEW,
+#define NFNLGRP_CONNTRACK_NEW           NFNLGRP_CONNTRACK_NEW
+        NFNLGRP_CONNTRACK_UPDATE,
+#define NFNLGRP_CONNTRACK_UPDATE        NFNLGRP_CONNTRACK_UPDATE
+        NFNLGRP_CONNTRACK_DESTROY,
+#define NFNLGRP_CONNTRACK_DESTROY       NFNLGRP_CONNTRACK_DESTROY
+        NFNLGRP_CONNTRACK_EXP_NEW,
+#define NFNLGRP_CONNTRACK_EXP_NEW       NFNLGRP_CONNTRACK_EXP_NEW
+        NFNLGRP_CONNTRACK_EXP_UPDATE,
+#define NFNLGRP_CONNTRACK_EXP_UPDATE    NFNLGRP_CONNTRACK_EXP_UPDATE
+        NFNLGRP_CONNTRACK_EXP_DESTROY,
+#define NFNLGRP_CONNTRACK_EXP_DESTROY   NFNLGRP_CONNTRACK_EXP_DESTROY
+        __NFNLGRP_MAX,
+};
+#define NFNLGRP_MAX     (__NFNLGRP_MAX - 1)
+/* Generic structure for encapsulation optional netfilter information.
+ * It is reminiscent of sockaddr, but with sa_family replaced
+ * with attribute type. 
+ * ! This should someday be put somewhere generic as now rtnetlink and
+ * ! nfnetlink use the same attributes methods. - J. Schulist.
+ */
+struct nfattr
+{
+        u_int16_t nfa_len;
+        u_int16_t nfa_type;
+} __attribute__ ((packed));
+/* FIXME: Shamelessly copy and pasted from rtnetlink.h, it's time
+ *        to put this in a generic file */
+#define NFA_ALIGNTO     4
+#define NFA_ALIGN(len)  (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1))
+#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \
+        && (nfa)->nfa_len <= (len))
+#define NFA_NEXT(nfa,attrlen)   ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \
+        (struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len)))
+#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len))
+#define NFA_SPACE(len)  NFA_ALIGN(NFA_LENGTH(len))
+#define NFA_DATA(nfa)   ((void *)(((char *)(nfa)) + NFA_LENGTH(0)))
+#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0))
+#define NFA_NEST(skb, type) \
+({      struct nfattr *__start = (struct nfattr *) (skb)->tail; \
+        NFA_PUT(skb, type, 0, NULL); \
+        __start;  })
+#define NFA_NEST_END(skb, start) \
+({      (start)->nfa_len = ((skb)->tail - (unsigned char *) (start)); \
+        (skb)->len; })
+#define NFA_NEST_CANCEL(skb, start) \
+({      if (start) \
+                skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
+        -1; })
+/* General form of address family dependent message.
+ */
+struct nfgenmsg {
+        u_int8_t  nfgen_family;         /* AF_xxx */
+        u_int8_t  version;              /* nfnetlink version */
+        u_int16_t res_id;               /* resource id */
+} __attribute__ ((packed));
+#define NFNETLINK_V0    0
+#define NFM_NFA(n)      ((struct nfattr *)(((char *)(n)) \
+        + NLMSG_ALIGN(sizeof(struct nfgenmsg))))
+#define NFM_PAYLOAD(n)  NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg))
+/* netfilter netlink message types are split in two pieces:
+ * 8 bit subsystem, 8bit operation.
+ */
+#define NFNL_SUBSYS_ID(x)       ((x & 0xff00) >> 8)
+#define NFNL_MSG_TYPE(x)        (x & 0x00ff)
+/* No enum here, otherwise __stringify() trick of MODULE_ALIAS_NFNL_SUBSYS()
+ * won't work anymore */
+#define NFNL_SUBSYS_NONE                0
+#define NFNL_SUBSYS_CTNETLINK           1
+#define NFNL_SUBSYS_CTNETLINK_EXP       2
+#define NFNL_SUBSYS_QUEUE               3
+#define NFNL_SUBSYS_ULOG                4
+#define NFNL_SUBSYS_COUNT               5
+#ifdef __KERNEL__
+#include <linux/netlink.h>
+#include <linux/capability.h>
+struct nfnl_callback
+{
+        int (*call)(struct sock *nl, struct sk_buff *skb, 
+                struct nlmsghdr *nlh, struct nfattr *cda[], int *errp);
+        kernel_cap_t cap_required; /* capabilities required for this msg */
+        u_int16_t attr_count;   /* number of nfattr's */
+};
+struct nfnetlink_subsystem
+{
+        const char *name;
+        __u8 subsys_id;         /* nfnetlink subsystem ID */
+        __u8 cb_count;          /* number of callbacks */
+        struct nfnl_callback *cb; /* callback for individual types */
+};
+extern void __nfa_fill(struct sk_buff *skb, int attrtype,
+        int attrlen, const void *data);
+#define NFA_PUT(skb, attrtype, attrlen, data) \
+({ if (skb_tailroom(skb) < (int)NFA_SPACE(attrlen)) goto nfattr_failure; \
+   __nfa_fill(skb, attrtype, attrlen, data); })
+extern struct semaphore nfnl_sem;
+#define nfnl_shlock()           down(&nfnl_sem)
+#define nfnl_shlock_nowait()    down_trylock(&nfnl_sem)
+#define nfnl_shunlock()         do { up(&nfnl_sem); \
+                                     if(nfnl && nfnl->sk_receive_queue.qlen) \
+                                            nfnl->sk_data_ready(nfnl, 0); \
+                                } while(0)
+extern void nfnl_lock(void);
+extern void nfnl_unlock(void);
+extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);
+extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);
+extern int nfattr_parse(struct nfattr *tb[], int maxattr, 
+                        struct nfattr *nfa, int len);
+#define nfattr_parse_nested(tb, max, nfa) \
+        nfattr_parse((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
+#define nfattr_bad_size(tb, max, cta_min)                               \
+({      int __i, __res = 0;                                             \
+        for (__i=0; __i<max; __i++)                                     \
+                if (tb[__i] && NFA_PAYLOAD(tb[__i]) < cta_min[__i]){    \
+                        __res = 1;                                      \
+                        break;                                          \
+                }                                                       \
+        __res;                                                          \
+})
+extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, 
+                          int echo);
+extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);
+#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
+        MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
+#endif  /* __KERNEL__ */
+#endif  /* _NFNETLINK_H */
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
new file mode 100644
index 000000000000..5c55751c78e4
--- /dev/null
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -0,0 +1,124 @@
+#ifndef _IPCONNTRACK_NETLINK_H
+#define _IPCONNTRACK_NETLINK_H
+#include <linux/netfilter/nfnetlink.h>
+enum cntl_msg_types {
+        IPCTNL_MSG_CT_NEW,
+        IPCTNL_MSG_CT_GET,
+        IPCTNL_MSG_CT_DELETE,
+        IPCTNL_MSG_CT_GET_CTRZERO,
+        IPCTNL_MSG_MAX
+};
+enum ctnl_exp_msg_types {
+        IPCTNL_MSG_EXP_NEW,
+        IPCTNL_MSG_EXP_GET,
+        IPCTNL_MSG_EXP_DELETE,
+        IPCTNL_MSG_EXP_MAX
+};
+enum ctattr_type {
+        CTA_UNSPEC,
+        CTA_TUPLE_ORIG,
+        CTA_TUPLE_REPLY,
+        CTA_STATUS,
+        CTA_PROTOINFO,
+        CTA_HELP,
+        CTA_NAT,
+        CTA_TIMEOUT,
+        CTA_MARK,
+        CTA_COUNTERS_ORIG,
+        CTA_COUNTERS_REPLY,
+        CTA_USE,
+        CTA_ID,
+        __CTA_MAX
+};
+#define CTA_MAX (__CTA_MAX - 1)
+enum ctattr_tuple {
+        CTA_TUPLE_UNSPEC,
+        CTA_TUPLE_IP,
+        CTA_TUPLE_PROTO,
+        __CTA_TUPLE_MAX
+};
+#define CTA_TUPLE_MAX (__CTA_TUPLE_MAX - 1)
+enum ctattr_ip {
+        CTA_IP_UNSPEC,
+        CTA_IP_V4_SRC,
+        CTA_IP_V4_DST,
+        CTA_IP_V6_SRC,
+        CTA_IP_V6_DST,
+        __CTA_IP_MAX
+};
+#define CTA_IP_MAX (__CTA_IP_MAX - 1)
+enum ctattr_l4proto {
+        CTA_PROTO_UNSPEC,
+        CTA_PROTO_NUM,
+        CTA_PROTO_SRC_PORT,
+        CTA_PROTO_DST_PORT,
+        CTA_PROTO_ICMP_ID,
+        CTA_PROTO_ICMP_TYPE,
+        CTA_PROTO_ICMP_CODE,
+        __CTA_PROTO_MAX
+};
+#define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1)
+enum ctattr_protoinfo {
+        CTA_PROTOINFO_UNSPEC,
+        CTA_PROTOINFO_TCP_STATE,
+        __CTA_PROTOINFO_MAX
+};
+#define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1)
+enum ctattr_counters {
+        CTA_COUNTERS_UNSPEC,
+        CTA_COUNTERS_PACKETS,
+        CTA_COUNTERS_BYTES,
+        __CTA_COUNTERS_MAX
+};
+#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)
+enum ctattr_nat {
+        CTA_NAT_UNSPEC,
+        CTA_NAT_MINIP,
+        CTA_NAT_MAXIP,
+        CTA_NAT_PROTO,
+        __CTA_NAT_MAX
+};
+#define CTA_NAT_MAX (__CTA_NAT_MAX - 1)
+enum ctattr_protonat {
+        CTA_PROTONAT_UNSPEC,
+        CTA_PROTONAT_PORT_MIN,
+        CTA_PROTONAT_PORT_MAX,
+        __CTA_PROTONAT_MAX
+};
+#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1)
+enum ctattr_expect {
+        CTA_EXPECT_UNSPEC,
+        CTA_EXPECT_MASTER,
+        CTA_EXPECT_TUPLE,
+        CTA_EXPECT_MASK,
+        CTA_EXPECT_TIMEOUT,
+        CTA_EXPECT_ID,
+        CTA_EXPECT_HELP_NAME,
+        __CTA_EXPECT_MAX
+};
+#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1)
+enum ctattr_help {
+        CTA_HELP_UNSPEC,
+        CTA_HELP_NAME,
+        __CTA_HELP_MAX
+};
+#define CTA_HELP_MAX (__CTA_HELP_MAX - 1)
+#define CTA_HELP_MAXNAMESIZE    32
+#endif /* _IPCONNTRACK_NETLINK_H */
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
new file mode 100644
index 000000000000..b04b03880595
--- /dev/null
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -0,0 +1,88 @@
+#ifndef _NFNETLINK_LOG_H
+#define _NFNETLINK_LOG_H
+/* This file describes the netlink messages (i.e. 'protocol packets'),
+ * and not any kind of function definitions.  It is shared between kernel and
+ * userspace.  Don't put kernel specific stuff in here */
+#include <linux/types.h>
+#include <linux/netfilter/nfnetlink.h>
+enum nfulnl_msg_types {
+        NFULNL_MSG_PACKET,              /* packet from kernel to userspace */
+        NFULNL_MSG_CONFIG,              /* connect to a particular queue */
+        NFULNL_MSG_MAX
+};
+struct nfulnl_msg_packet_hdr {
+        u_int16_t       hw_protocol;    /* hw protocol (network order) */
+        u_int8_t        hook;           /* netfilter hook */
+        u_int8_t        _pad;
+} __attribute__ ((packed));
+struct nfulnl_msg_packet_hw {
+        u_int16_t       hw_addrlen;
+        u_int16_t       _pad;
+        u_int8_t        hw_addr[8];
+} __attribute__ ((packed));
+struct nfulnl_msg_packet_timestamp {
+        aligned_u64     sec;
+        aligned_u64     usec;
+} __attribute__ ((packed));
+#define NFULNL_PREFIXLEN        30      /* just like old log target */
+enum nfulnl_attr_type {
+        NFULA_UNSPEC,
+        NFULA_PACKET_HDR,
+        NFULA_MARK,                     /* u_int32_t nfmark */
+        NFULA_TIMESTAMP,                /* nfulnl_msg_packet_timestamp */
+        NFULA_IFINDEX_INDEV,            /* u_int32_t ifindex */
+        NFULA_IFINDEX_OUTDEV,           /* u_int32_t ifindex */
+        NFULA_IFINDEX_PHYSINDEV,        /* u_int32_t ifindex */
+        NFULA_IFINDEX_PHYSOUTDEV,       /* u_int32_t ifindex */
+        NFULA_HWADDR,                   /* nfulnl_msg_packet_hw */
+        NFULA_PAYLOAD,                  /* opaque data payload */
+        NFULA_PREFIX,                   /* string prefix */
+        NFULA_UID,                      /* user id of socket */
+        __NFULA_MAX
+};
+#define NFULA_MAX (__NFULA_MAX - 1)
+enum nfulnl_msg_config_cmds {
+        NFULNL_CFG_CMD_NONE,
+        NFULNL_CFG_CMD_BIND,
+        NFULNL_CFG_CMD_UNBIND,
+        NFULNL_CFG_CMD_PF_BIND,
+        NFULNL_CFG_CMD_PF_UNBIND,
+};
+struct nfulnl_msg_config_cmd {
+        u_int8_t        command;        /* nfulnl_msg_config_cmds */
+} __attribute__ ((packed));
+struct nfulnl_msg_config_mode {
+        u_int32_t       copy_range;
+        u_int8_t        copy_mode;
+        u_int8_t        _pad;
+} __attribute__ ((packed));
+enum nfulnl_attr_config {
+        NFULA_CFG_UNSPEC,
+        NFULA_CFG_CMD,                  /* nfulnl_msg_config_cmd */
+        NFULA_CFG_MODE,                 /* nfulnl_msg_config_mode */
+        NFULA_CFG_NLBUFSIZ,             /* u_int32_t buffer size */
+        NFULA_CFG_TIMEOUT,              /* u_int32_t in 1/100 s */
+        NFULA_CFG_QTHRESH,              /* u_int32_t */
+        __NFULA_CFG_MAX
+};
+#define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
+#define NFULNL_COPY_NONE        0x00
+#define NFULNL_COPY_META        0x01
+#define NFULNL_COPY_PACKET      0x02
+#endif /* _NFNETLINK_LOG_H */
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
new file mode 100644
index 000000000000..9e774373244c
--- /dev/null
+++ b/include/linux/netfilter/nfnetlink_queue.h
@@ -0,0 +1,89 @@
+#ifndef _NFNETLINK_QUEUE_H
+#define _NFNETLINK_QUEUE_H
+#include <linux/types.h>
+#include <linux/netfilter/nfnetlink.h>
+enum nfqnl_msg_types {
+        NFQNL_MSG_PACKET,               /* packet from kernel to userspace */
+        NFQNL_MSG_VERDICT,              /* verdict from userspace to kernel */
+        NFQNL_MSG_CONFIG,               /* connect to a particular queue */
+        NFQNL_MSG_MAX
+};
+struct nfqnl_msg_packet_hdr {
+        u_int32_t       packet_id;      /* unique ID of packet in queue */
+        u_int16_t       hw_protocol;    /* hw protocol (network order) */
+        u_int8_t        hook;           /* netfilter hook */
+} __attribute__ ((packed));
+struct nfqnl_msg_packet_hw {
+        u_int16_t       hw_addrlen;
+        u_int16_t       _pad;
+        u_int8_t        hw_addr[8];
+} __attribute__ ((packed));
+struct nfqnl_msg_packet_timestamp {
+        aligned_u64     sec;
+        aligned_u64     usec;
+} __attribute__ ((packed));
+enum nfqnl_attr_type {
+        NFQA_UNSPEC,
+        NFQA_PACKET_HDR,
+        NFQA_VERDICT_HDR,               /* nfqnl_msg_verdict_hrd */
+        NFQA_MARK,                      /* u_int32_t nfmark */
+        NFQA_TIMESTAMP,                 /* nfqnl_msg_packet_timestamp */
+        NFQA_IFINDEX_INDEV,             /* u_int32_t ifindex */
+        NFQA_IFINDEX_OUTDEV,            /* u_int32_t ifindex */
+        NFQA_IFINDEX_PHYSINDEV,         /* u_int32_t ifindex */
+        NFQA_IFINDEX_PHYSOUTDEV,        /* u_int32_t ifindex */
+        NFQA_HWADDR,                    /* nfqnl_msg_packet_hw */
+        NFQA_PAYLOAD,                   /* opaque data payload */
+        __NFQA_MAX
+};
+#define NFQA_MAX (__NFQA_MAX - 1)
+struct nfqnl_msg_verdict_hdr {
+        u_int32_t verdict;
+        u_int32_t id;
+} __attribute__ ((packed));
+enum nfqnl_msg_config_cmds {
+        NFQNL_CFG_CMD_NONE,
+        NFQNL_CFG_CMD_BIND,
+        NFQNL_CFG_CMD_UNBIND,
+        NFQNL_CFG_CMD_PF_BIND,
+        NFQNL_CFG_CMD_PF_UNBIND,
+};
+struct nfqnl_msg_config_cmd {
+        u_int8_t        command;        /* nfqnl_msg_config_cmds */
+        u_int8_t        _pad;
+        u_int16_t       pf;             /* AF_xxx for PF_[UN]BIND */
+} __attribute__ ((packed));
+enum nfqnl_config_mode {
+        NFQNL_COPY_NONE,
+        NFQNL_COPY_META,
+        NFQNL_COPY_PACKET,
+};
+struct nfqnl_msg_config_params {
+        u_int32_t       copy_range;
+        u_int8_t        copy_mode;      /* enum nfqnl_config_mode */
+} __attribute__ ((packed));
+enum nfqnl_attr_config {
+        NFQA_CFG_UNSPEC,
+        NFQA_CFG_CMD,                   /* nfqnl_msg_config_cmd */
+        NFQA_CFG_PARAMS,                /* nfqnl_msg_config_params */
+        __NFQA_CFG_MAX
+};
+#define NFQA_CFG_MAX (__NFQA_CFG_MAX-1)
+#endif /* _NFNETLINK_QUEUE_H */
diff --git a/include/linux/netfilter_decnet.h b/include/linux/netfilter_decnet.h
index 3064eec9cb8e..6f425369ee29 100644
--- a/include/linux/netfilter_decnet.h
+++ b/include/linux/netfilter_decnet.h
@@ -9,6 +9,8 @@
 #include <linux/netfilter.h>
+/* only for userspace compatibility */
+#ifndef __KERNEL__
 /* IP Cache bits. */
 /* Src IP address. */
 #define NFC_DN_SRC              0x0001
@@ -18,6 +20,7 @@
 #define NFC_DN_IF_IN            0x0004
 /* Output device. */
 #define NFC_DN_IF_OUT           0x0008
+#endif /* ! __KERNEL__ */
 /* DECnet Hooks */
 /* After promisc drops, checksum checks. */
@@ -53,7 +56,21 @@ struct nf_dn_rtmsg {
 #define NFDN_RTMSG(r) ((unsigned char *)(r) + NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg)))
+#ifndef __KERNEL__
+/* backwards compatibility for userspace */
 #define DNRMG_L1_GROUP 0x01
 #define DNRMG_L2_GROUP 0x02
+#endif
+enum {
+        DNRNG_NLGRP_NONE,
+#define DNRNG_NLGRP_NONE        DNRNG_NLGRP_NONE
+        DNRNG_NLGRP_L1,
+#define DNRNG_NLGRP_L1          DNRNG_NLGRP_L1
+        DNRNG_NLGRP_L2,
+#define DNRNG_NLGRP_L2          DNRNG_NLGRP_L2
+        __DNRNG_NLGRP_MAX
+};
+#define DNRNG_NLGRP_MAX (__DNRNG_NLGRP_MAX - 1)
 #endif /*__LINUX_DECNET_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 3ebc36afae1a..fdc4a9527343 100644
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -8,6 +8,8 @@
 #include <linux/config.h>
 #include <linux/netfilter.h>
+/* only for userspace compatibility */
+#ifndef __KERNEL__
 /* IP Cache bits. */
 /* Src IP address. */
 #define NFC_IP_SRC              0x0001
@@ -35,6 +37,7 @@
 #define NFC_IP_DST_PT           0x0400
 /* Something else about the proto */
 #define NFC_IP_PROTO_UNKNOWN    0x2000
+#endif /* ! __KERNEL__ */
 /* IP Hooks */
 /* After promisc drops, checksum checks. */
@@ -77,11 +80,6 @@ enum nf_ip_hook_priorities {
 #ifdef __KERNEL__
 extern int ip_route_me_harder(struct sk_buff **pskb);
-/* Call this before modifying an existing IP packet: ensures it is
-   modifiable and linear to the point you care about (writable_len).
-   Returns true or false. */
-extern int skb_ip_make_writable(struct sk_buff **pskb,
-                                unsigned int writable_len);
 #endif /*__KERNEL__*/
 #endif /*__LINUX_IP_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 3781192ce159..088742befe49 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -65,6 +65,63 @@ enum ip_conntrack_status {
        /* Both together */
        IPS_NAT_DONE_MASK = (IPS_DST_NAT_DONE | IPS_SRC_NAT_DONE),
+        /* Connection is dying (removed from lists), can not be unset. */
+        IPS_DYING_BIT = 9,
+        IPS_DYING = (1 << IPS_DYING_BIT),
+};
+/* Connection tracking event bits */
+enum ip_conntrack_events
+{
+        /* New conntrack */
+        IPCT_NEW_BIT = 0,
+        IPCT_NEW = (1 << IPCT_NEW_BIT),
+        /* Expected connection */
+        IPCT_RELATED_BIT = 1,
+        IPCT_RELATED = (1 << IPCT_RELATED_BIT),
+        /* Destroyed conntrack */
+        IPCT_DESTROY_BIT = 2,
+        IPCT_DESTROY = (1 << IPCT_DESTROY_BIT),
+        /* Timer has been refreshed */
+        IPCT_REFRESH_BIT = 3,
+        IPCT_REFRESH = (1 << IPCT_REFRESH_BIT),
+        /* Status has changed */
+        IPCT_STATUS_BIT = 4,
+        IPCT_STATUS = (1 << IPCT_STATUS_BIT),
+        /* Update of protocol info */
+        IPCT_PROTOINFO_BIT = 5,
+        IPCT_PROTOINFO = (1 << IPCT_PROTOINFO_BIT),
+        /* Volatile protocol info */
+        IPCT_PROTOINFO_VOLATILE_BIT = 6,
+        IPCT_PROTOINFO_VOLATILE = (1 << IPCT_PROTOINFO_VOLATILE_BIT),
+        /* New helper for conntrack */
+        IPCT_HELPER_BIT = 7,
+        IPCT_HELPER = (1 << IPCT_HELPER_BIT),
+        /* Update of helper info */
+        IPCT_HELPINFO_BIT = 8,
+        IPCT_HELPINFO = (1 << IPCT_HELPINFO_BIT),
+        /* Volatile helper info */
+        IPCT_HELPINFO_VOLATILE_BIT = 9,
+        IPCT_HELPINFO_VOLATILE = (1 << IPCT_HELPINFO_VOLATILE_BIT),
+        /* NAT info */
+        IPCT_NATINFO_BIT = 10,
+        IPCT_NATINFO = (1 << IPCT_NATINFO_BIT),
+};
+enum ip_conntrack_expect_events {
+        IPEXP_NEW_BIT = 0,
+        IPEXP_NEW = (1 << IPEXP_NEW_BIT),
 };
 #ifdef __KERNEL__
@@ -152,6 +209,9 @@ struct ip_conntrack
        /* Current number of expected connections */
        unsigned int expecting;
+        /* Unique ID that identifies this conntrack*/
+        unsigned int id;
        /* Helper, if any. */
        struct ip_conntrack_helper *helper;
@@ -171,7 +231,7 @@ struct ip_conntrack
 #endif /* CONFIG_IP_NF_NAT_NEEDED */
 #if defined(CONFIG_IP_NF_CONNTRACK_MARK)
-        unsigned long mark;
+        u_int32_t mark;
 #endif
        /* Traversed often, so hopefully in different cacheline to top */
@@ -197,6 +257,12 @@ struct ip_conntrack_expect
        /* Timer function; deletes the expectation. */
        struct timer_list timeout;
+        /* Usage count. */
+        atomic_t use;
+        /* Unique ID */
+        unsigned int id;
 #ifdef CONFIG_IP_NF_NAT_NEEDED
        /* This is the original per-proto part, used to map the
         * expected connection the way the recipient expects. */
@@ -236,7 +302,12 @@ ip_conntrack_get(const struct sk_buff *skb, enum ip_conntrack_info *ctinfo)
 }
 /* decrement reference count on a conntrack */
-extern inline void ip_conntrack_put(struct ip_conntrack *ct);
+static inline void
+ip_conntrack_put(struct ip_conntrack *ct)
+{
+        IP_NF_ASSERT(ct);
+        nf_conntrack_put(&ct->ct_general);
+}
 /* call to create an explicit dependency on ip_conntrack. */
 extern void need_ip_conntrack(void);
@@ -271,12 +342,50 @@ extern void
 ip_ct_iterate_cleanup(int (*iter)(struct ip_conntrack *i, void *data),
                      void *data);
+extern struct ip_conntrack_helper *
+__ip_conntrack_helper_find_byname(const char *);
+extern struct ip_conntrack_helper *
+ip_conntrack_helper_find_get(const struct ip_conntrack_tuple *tuple);
+extern void ip_conntrack_helper_put(struct ip_conntrack_helper *helper);
+extern struct ip_conntrack_protocol *
+__ip_conntrack_proto_find(u_int8_t protocol);
+extern struct ip_conntrack_protocol *
+ip_conntrack_proto_find_get(u_int8_t protocol);
+extern void ip_conntrack_proto_put(struct ip_conntrack_protocol *proto);
+extern void ip_ct_remove_expectations(struct ip_conntrack *ct);
+extern struct ip_conntrack *ip_conntrack_alloc(struct ip_conntrack_tuple *,
+                                               struct ip_conntrack_tuple *);
+extern void ip_conntrack_free(struct ip_conntrack *ct);
+extern void ip_conntrack_hash_insert(struct ip_conntrack *ct);
+extern struct ip_conntrack_expect *
+__ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);
+extern struct ip_conntrack_expect *
+ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple);
+extern struct ip_conntrack_tuple_hash *
+__ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
+                    const struct ip_conntrack *ignored_conntrack);
+extern void ip_conntrack_flush(void);
 /* It's confirmed if it is, or has been in the hash table. */
 static inline int is_confirmed(struct ip_conntrack *ct)
 {
        return test_bit(IPS_CONFIRMED_BIT, &ct->status);
 }
+static inline int is_dying(struct ip_conntrack *ct)
+{
+        return test_bit(IPS_DYING_BIT, &ct->status);
+}
 extern unsigned int ip_conntrack_htable_size;
 
 struct ip_conntrack_stat
@@ -300,6 +409,85 @@ struct ip_conntrack_stat
 #define CONNTRACK_STAT_INC(count) (__get_cpu_var(ip_conntrack_stat).count++)
+#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
+#include <linux/notifier.h>
+#include <linux/interrupt.h>
+struct ip_conntrack_ecache {
+        struct ip_conntrack *ct;
+        unsigned int events;
+};
+DECLARE_PER_CPU(struct ip_conntrack_ecache, ip_conntrack_ecache);
+#define CONNTRACK_ECACHE(x)     (__get_cpu_var(ip_conntrack_ecache).x)
+ 
+extern struct notifier_block *ip_conntrack_chain;
+extern struct notifier_block *ip_conntrack_expect_chain;
+static inline int ip_conntrack_register_notifier(struct notifier_block *nb)
+{
+        return notifier_chain_register(&ip_conntrack_chain, nb);
+}
+static inline int ip_conntrack_unregister_notifier(struct notifier_block *nb)
+{
+        return notifier_chain_unregister(&ip_conntrack_chain, nb);
+}
+static inline int 
+ip_conntrack_expect_register_notifier(struct notifier_block *nb)
+{
+        return notifier_chain_register(&ip_conntrack_expect_chain, nb);
+}
+static inline int
+ip_conntrack_expect_unregister_notifier(struct notifier_block *nb)
+{
+        return notifier_chain_unregister(&ip_conntrack_expect_chain, nb);
+}
+extern void ip_ct_deliver_cached_events(const struct ip_conntrack *ct);
+extern void __ip_ct_event_cache_init(struct ip_conntrack *ct);
+static inline void 
+ip_conntrack_event_cache(enum ip_conntrack_events event,
+                         const struct sk_buff *skb)
+{
+        struct ip_conntrack *ct = (struct ip_conntrack *)skb->nfct;
+        struct ip_conntrack_ecache *ecache;
+        
+        local_bh_disable();
+        ecache = &__get_cpu_var(ip_conntrack_ecache);
+        if (ct != ecache->ct)
+                __ip_ct_event_cache_init(ct);
+        ecache->events |= event;
+        local_bh_enable();
+}
+static inline void ip_conntrack_event(enum ip_conntrack_events event,
+                                      struct ip_conntrack *ct)
+{
+        if (is_confirmed(ct) && !is_dying(ct))
+                notifier_call_chain(&ip_conntrack_chain, event, ct);
+}
+static inline void 
+ip_conntrack_expect_event(enum ip_conntrack_expect_events event,
+                          struct ip_conntrack_expect *exp)
+{
+        notifier_call_chain(&ip_conntrack_expect_chain, event, exp);
+}
+#else /* CONFIG_IP_NF_CONNTRACK_EVENTS */
+static inline void ip_conntrack_event_cache(enum ip_conntrack_events event, 
+                                            const struct sk_buff *skb) {}
+static inline void ip_conntrack_event(enum ip_conntrack_events event, 
+                                      struct ip_conntrack *ct) {}
+static inline void ip_ct_deliver_cached_events(const struct ip_conntrack *ct) {}
+static inline void 
+ip_conntrack_expect_event(enum ip_conntrack_expect_events event, 
+                          struct ip_conntrack_expect *exp) {}
+#endif /* CONFIG_IP_NF_CONNTRACK_EVENTS */
 #ifdef CONFIG_IP_NF_NAT_NEEDED
 static inline int ip_nat_initialized(struct ip_conntrack *conntrack,
                                     enum ip_nat_manip_type manip)
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_core.h b/include/linux/netfilter_ipv4/ip_conntrack_core.h
index 694aec9b4784..dc4d2a0575de 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_core.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_core.h
@@ -2,6 +2,9 @@
 #define _IP_CONNTRACK_CORE_H
 #include <linux/netfilter.h>
+#define MAX_IP_CT_PROTO 256
+extern struct ip_conntrack_protocol *ip_ct_protos[MAX_IP_CT_PROTO];
 /* This header is used to share core functionality between the
   standalone connection tracking module, and the compatibility layer's use
   of connection tracking. */
@@ -38,12 +41,19 @@ extern int __ip_conntrack_confirm(struct sk_buff **pskb);
 /* Confirm a connection: returns NF_DROP if packet must be dropped. */
 static inline int ip_conntrack_confirm(struct sk_buff **pskb)
 {
-        if ((*pskb)->nfct
+        struct ip_conntrack *ct = (struct ip_conntrack *)(*pskb)->nfct;
-            && !is_confirmed((struct ip_conntrack *)(*pskb)->nfct))
+        int ret = NF_ACCEPT;
-                return __ip_conntrack_confirm(pskb);
-        return NF_ACCEPT;
+        if (ct) {
+                if (!is_confirmed(ct))
+                        ret = __ip_conntrack_confirm(pskb);
+                ip_ct_deliver_cached_events(ct);
+        }
+        return ret;
 }
+extern void __ip_ct_expect_unlink_destroy(struct ip_conntrack_expect *exp);
 extern struct list_head *ip_conntrack_hash;
 extern struct list_head ip_conntrack_expect_list;
 extern rwlock_t ip_conntrack_lock;
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper.h b/include/linux/netfilter_ipv4/ip_conntrack_helper.h
index b1bbba0a12cb..8d69279ccfe4 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper.h
@@ -24,15 +24,18 @@ struct ip_conntrack_helper
        int (*help)(struct sk_buff **pskb,
                    struct ip_conntrack *ct,
                    enum ip_conntrack_info conntrackinfo);
+        int (*to_nfattr)(struct sk_buff *skb, const struct ip_conntrack *ct);
 };
 extern int ip_conntrack_helper_register(struct ip_conntrack_helper *);
 extern void ip_conntrack_helper_unregister(struct ip_conntrack_helper *);
 /* Allocate space for an expectation: this is mandatory before calling 
-   ip_conntrack_expect_related. */
+   ip_conntrack_expect_related.  You will have to call put afterwards. */
-extern struct ip_conntrack_expect *ip_conntrack_expect_alloc(void);
+extern struct ip_conntrack_expect *
-extern void ip_conntrack_expect_free(struct ip_conntrack_expect *exp);
+ip_conntrack_expect_alloc(struct ip_conntrack *master);
+extern void ip_conntrack_expect_put(struct ip_conntrack_expect *exp);
 /* Add an expected connection: can have more than one per connection */
 extern int ip_conntrack_expect_related(struct ip_conntrack_expect *exp);
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_protocol.h b/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
index e20b57c5e1b7..b6b99be8632a 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
@@ -2,6 +2,7 @@
 #ifndef _IP_CONNTRACK_PROTOCOL_H
 #define _IP_CONNTRACK_PROTOCOL_H
 #include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter/nfnetlink_conntrack.h>
 struct seq_file;
@@ -47,22 +48,22 @@ struct ip_conntrack_protocol
        int (*error)(struct sk_buff *skb, enum ip_conntrack_info *ctinfo,
                     unsigned int hooknum);
+        /* convert protoinfo to nfnetink attributes */
+        int (*to_nfattr)(struct sk_buff *skb, struct nfattr *nfa,
+                         const struct ip_conntrack *ct);
+        int (*tuple_to_nfattr)(struct sk_buff *skb,
+                               const struct ip_conntrack_tuple *t);
+        int (*nfattr_to_tuple)(struct nfattr *tb[],
+                               struct ip_conntrack_tuple *t);
        /* Module (if any) which this is connected to. */
        struct module *me;
 };
-#define MAX_IP_CT_PROTO 256
-extern struct ip_conntrack_protocol *ip_ct_protos[MAX_IP_CT_PROTO];
 /* Protocol registration. */
 extern int ip_conntrack_protocol_register(struct ip_conntrack_protocol *proto);
 extern void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto);
-static inline struct ip_conntrack_protocol *ip_ct_find_proto(u_int8_t protocol)
-{
-        return ip_ct_protos[protocol];
-}
 /* Existing built-in protocols */
 extern struct ip_conntrack_protocol ip_conntrack_protocol_tcp;
 extern struct ip_conntrack_protocol ip_conntrack_protocol_udp;
@@ -73,6 +74,11 @@ extern int ip_conntrack_protocol_tcp_init(void);
 /* Log invalid packets */
 extern unsigned int ip_ct_log_invalid;
+extern int ip_ct_port_tuple_to_nfattr(struct sk_buff *,
+                                      const struct ip_conntrack_tuple *);
+extern int ip_ct_port_nfattr_to_tuple(struct nfattr *tb[],
+                                      struct ip_conntrack_tuple *);
 #ifdef CONFIG_SYSCTL
 #ifdef DEBUG_INVALID_PACKETS
 #define LOG_INVALID(proto) \
diff --git a/include/linux/netfilter_ipv4/ip_logging.h b/include/linux/netfilter_ipv4/ip_logging.h
deleted file mode 100644
index 0c5c52cb6589..000000000000
--- a/include/linux/netfilter_ipv4/ip_logging.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* IPv4 macros for the internal logging interface. */
-#ifndef __IP_LOGGING_H
-#define __IP_LOGGING_H
-#ifdef __KERNEL__
-#include <linux/socket.h>
-#include <linux/netfilter_logging.h>
-#define nf_log_ip_packet(pskb,hooknum,in,out,fmt,args...) \
-        nf_log_packet(AF_INET,pskb,hooknum,in,out,fmt,##args)
-#define nf_log_ip(pfh,len,fmt,args...) \
-        nf_log(AF_INET,pfh,len,fmt,##args)
-#define nf_ip_log_register(logging) nf_log_register(AF_INET,logging)
-#define nf_ip_log_unregister(logging) nf_log_unregister(AF_INET,logging)
-        
-#endif /*__KERNEL__*/
-#endif /*__IP_LOGGING_H*/
diff --git a/include/linux/netfilter_ipv4/ip_nat_protocol.h b/include/linux/netfilter_ipv4/ip_nat_protocol.h
index 129708c22386..ef63aa991a06 100644
--- a/include/linux/netfilter_ipv4/ip_nat_protocol.h
+++ b/include/linux/netfilter_ipv4/ip_nat_protocol.h
@@ -4,6 +4,9 @@
 #include <linux/init.h>
 #include <linux/list.h>
+#include <linux/netfilter_ipv4/ip_nat.h>
+#include <linux/netfilter/nfnetlink_conntrack.h>
 struct iphdr;
 struct ip_nat_range;
@@ -15,6 +18,8 @@ struct ip_nat_protocol
        /* Protocol number. */
        unsigned int protonum;
+        struct module *me;
        /* Translate a packet to the target according to manip type.
           Return true if succeeded. */
        int (*manip_pkt)(struct sk_buff **pskb,
@@ -43,19 +48,20 @@ struct ip_nat_protocol
        unsigned int (*print_range)(char *buffer,
                                    const struct ip_nat_range *range);
-};
-#define MAX_IP_NAT_PROTO 256
+        int (*range_to_nfattr)(struct sk_buff *skb,
-extern struct ip_nat_protocol *ip_nat_protos[MAX_IP_NAT_PROTO];
+                               const struct ip_nat_range *range);
+        int (*nfattr_to_range)(struct nfattr *tb[],
+                               struct ip_nat_range *range);
+};
 /* Protocol registration. */
 extern int ip_nat_protocol_register(struct ip_nat_protocol *proto);
 extern void ip_nat_protocol_unregister(struct ip_nat_protocol *proto);
-static inline struct ip_nat_protocol *ip_nat_find_proto(u_int8_t protocol)
+extern struct ip_nat_protocol *ip_nat_proto_find_get(u_int8_t protocol);
-{
+extern void ip_nat_proto_put(struct ip_nat_protocol *proto);
-        return ip_nat_protos[protocol];
-}
 /* Built-in protocols. */
 extern struct ip_nat_protocol ip_nat_protocol_tcp;
@@ -67,4 +73,9 @@ extern int init_protocols(void) __init;
 extern void cleanup_protocols(void);
 extern struct ip_nat_protocol *find_nat_proto(u_int16_t protonum);
+extern int ip_nat_port_range_to_nfattr(struct sk_buff *skb,
+                                       const struct ip_nat_range *range);
+extern int ip_nat_port_nfattr_to_range(struct nfattr *tb[],
+                                       struct ip_nat_range *range);
 #endif /*_IP_NAT_PROTO_H*/
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 12ce47808e7d..d19d65cf4530 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -109,7 +109,8 @@ struct ipt_counters
 /* Values for "flag" field in struct ipt_ip (general ip structure). */
 #define IPT_F_FRAG              0x01    /* Set if rule is a fragment rule */
-#define IPT_F_MASK              0x01    /* All possible flag bits mask. */
+#define IPT_F_GOTO              0x02    /* Set if jump is a goto */
+#define IPT_F_MASK              0x03    /* All possible flag bits mask. */
 /* Values for "inv" field in struct ipt_ip. */
 #define IPT_INV_VIA_IN          0x01    /* Invert the sense of IN IFACE. */
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
index d25f782e57d1..22d16177319b 100644
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ b/include/linux/netfilter_ipv4/ipt_LOG.h
@@ -1,6 +1,7 @@
 #ifndef _IPT_LOG_H
 #define _IPT_LOG_H
+/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
 #define IPT_LOG_TCPSEQ          0x01    /* Log TCP sequence numbers */
 #define IPT_LOG_TCPOPT          0x02    /* Log TCP options */
 #define IPT_LOG_IPOPT           0x04    /* Log IP options */
diff --git a/include/linux/netfilter_ipv4/ipt_NFQUEUE.h b/include/linux/netfilter_ipv4/ipt_NFQUEUE.h
new file mode 100644
index 000000000000..b5b2943b0c66
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_NFQUEUE.h
@@ -0,0 +1,16 @@
+/* iptables module for using NFQUEUE mechanism
+ *
+ * (C) 2005 Harald Welte <laforge@netfilter.org>
+ *
+ * This software is distributed under GNU GPL v2, 1991
+ * 
+*/
+#ifndef _IPT_NFQ_TARGET_H
+#define _IPT_NFQ_TARGET_H
+/* target info */
+struct ipt_NFQ_info {
+        u_int16_t queuenum;
+};
+#endif /* _IPT_DSCP_TARGET_H */
diff --git a/include/linux/netfilter_ipv4/ipt_TTL.h b/include/linux/netfilter_ipv4/ipt_TTL.h
new file mode 100644
index 000000000000..ee6611edc112
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_TTL.h
@@ -0,0 +1,21 @@
+/* TTL modification module for IP tables
+ * (C) 2000 by Harald Welte <laforge@netfilter.org> */
+#ifndef _IPT_TTL_H
+#define _IPT_TTL_H
+enum {
+        IPT_TTL_SET = 0,
+        IPT_TTL_INC,
+        IPT_TTL_DEC
+};
+#define IPT_TTL_MAXMODE IPT_TTL_DEC
+struct ipt_TTL_info {
+        u_int8_t        mode;
+        u_int8_t        ttl;
+};
+#endif
diff --git a/include/linux/netfilter_ipv4/ipt_connbytes.h b/include/linux/netfilter_ipv4/ipt_connbytes.h
new file mode 100644
index 000000000000..9e5532f8d8ac
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_connbytes.h
@@ -0,0 +1,25 @@
+#ifndef _IPT_CONNBYTES_H
+#define _IPT_CONNBYTES_H
+enum ipt_connbytes_what {
+        IPT_CONNBYTES_PKTS,
+        IPT_CONNBYTES_BYTES,
+        IPT_CONNBYTES_AVGPKT,
+};
+enum ipt_connbytes_direction {
+        IPT_CONNBYTES_DIR_ORIGINAL,
+        IPT_CONNBYTES_DIR_REPLY,
+        IPT_CONNBYTES_DIR_BOTH,
+};
+struct ipt_connbytes_info
+{
+        struct {
+                aligned_u64 from;       /* count to be matched */
+                aligned_u64 to;         /* count to be matched */
+        } count;
+        u_int8_t what;          /* ipt_connbytes_what */
+        u_int8_t direction;     /* ipt_connbytes_direction */
+};
+#endif
diff --git a/include/linux/netfilter_ipv4/ipt_dccp.h b/include/linux/netfilter_ipv4/ipt_dccp.h
new file mode 100644
index 000000000000..3cb3a522e62b
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_dccp.h
@@ -0,0 +1,23 @@
+#ifndef _IPT_DCCP_H_
+#define _IPT_DCCP_H_
+#define IPT_DCCP_SRC_PORTS              0x01
+#define IPT_DCCP_DEST_PORTS             0x02
+#define IPT_DCCP_TYPE                   0x04
+#define IPT_DCCP_OPTION                 0x08
+#define IPT_DCCP_VALID_FLAGS            0x0f
+struct ipt_dccp_info {
+        u_int16_t dpts[2];  /* Min, Max */
+        u_int16_t spts[2];  /* Min, Max */
+        u_int16_t flags;
+        u_int16_t invflags;
+        u_int16_t typemask;
+        u_int8_t option;
+};
+#endif /* _IPT_DCCP_H_ */
diff --git a/include/linux/netfilter_ipv4/ipt_string.h b/include/linux/netfilter_ipv4/ipt_string.h
new file mode 100644
index 000000000000..a265f6e44eab
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_string.h
@@ -0,0 +1,18 @@
+#ifndef _IPT_STRING_H
+#define _IPT_STRING_H
+#define IPT_STRING_MAX_PATTERN_SIZE 128
+#define IPT_STRING_MAX_ALGO_NAME_SIZE 16
+struct ipt_string_info
+{
+        u_int16_t from_offset;
+        u_int16_t to_offset;
+        char      algo[IPT_STRING_MAX_ALGO_NAME_SIZE];
+        char      pattern[IPT_STRING_MAX_PATTERN_SIZE];
+        u_int8_t  patlen;
+        u_int8_t  invert;
+        struct ts_config __attribute__((aligned(8))) *config;
+};
+#endif /*_IPT_STRING_H*/
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index bee7a5ec7c66..edcc2c6eb5c7 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -10,6 +10,8 @@
 #include <linux/netfilter.h>
+/* only for userspace compatibility */
+#ifndef __KERNEL__
 /* IP Cache bits. */
 /* Src IP address. */
 #define NFC_IP6_SRC              0x0001
@@ -38,6 +40,7 @@
 #define NFC_IP6_DST_PT           0x0400
 /* Something else about the proto */
 #define NFC_IP6_PROTO_UNKNOWN    0x2000
+#endif /* ! __KERNEL__ */
 /* IP6 Hooks */
@@ -68,4 +71,7 @@ enum nf_ip6_hook_priorities {
        NF_IP6_PRI_LAST = INT_MAX,
 };
+extern int ipv6_netfilter_init(void);
+extern void ipv6_netfilter_fini(void);
 #endif /*__LINUX_IP6_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipv6/ip6_logging.h b/include/linux/netfilter_ipv6/ip6_logging.h
deleted file mode 100644
index a0b2ee3043aa..000000000000
--- a/include/linux/netfilter_ipv6/ip6_logging.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* IPv6 macros for the nternal logging interface. */
-#ifndef __IP6_LOGGING_H
-#define __IP6_LOGGING_H
-#ifdef __KERNEL__
-#include <linux/socket.h>
-#include <linux/netfilter_logging.h>
-#define nf_log_ip6_packet(pskb,hooknum,in,out,fmt,args...) \
-        nf_log_packet(AF_INET6,pskb,hooknum,in,out,fmt,##args)
-#define nf_log_ip6(pfh,len,fmt,args...) \
-        nf_log(AF_INET6,pfh,len,fmt,##args)
-#define nf_ip6_log_register(logging) nf_log_register(AF_INET6,logging)
-#define nf_ip6_log_unregister(logging) nf_log_unregister(AF_INET6,logging)
-        
-#endif /*__KERNEL__*/
-#endif /*__IP6_LOGGING_H*/
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index f1ce3b009853..58c72a52dc65 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -111,7 +111,8 @@ struct ip6t_counters
 #define IP6T_F_PROTO            0x01    /* Set if rule cares about upper 
                                           protocols */
 #define IP6T_F_TOS              0x02    /* Match the TOS. */
-#define IP6T_F_MASK             0x03    /* All possible flag bits mask. */
+#define IP6T_F_GOTO             0x04    /* Set if jump is a goto */
+#define IP6T_F_MASK             0x07    /* All possible flag bits mask. */
 /* Values for "inv" field in struct ip6t_ip6. */
 #define IP6T_INV_VIA_IN         0x01    /* Invert the sense of IN IFACE. */
diff --git a/include/linux/netfilter_ipv6/ip6t_HL.h b/include/linux/netfilter_ipv6/ip6t_HL.h
new file mode 100644
index 000000000000..afb7813d45ab
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_HL.h
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+ * Based on HW's TTL module */
+#ifndef _IP6T_HL_H
+#define _IP6T_HL_H
+enum {
+        IP6T_HL_SET = 0,
+        IP6T_HL_INC,
+        IP6T_HL_DEC
+};
+#define IP6T_HL_MAXMODE IP6T_HL_DEC
+struct ip6t_HL_info {
+        u_int8_t        mode;
+        u_int8_t        hop_limit;
+};
+#endif
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h
index 42996a43bb39..9008ff5c40ae 100644
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/include/linux/netfilter_ipv6/ip6t_LOG.h
@@ -1,6 +1,7 @@
 #ifndef _IP6T_LOG_H
 #define _IP6T_LOG_H
+/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
 #define IP6T_LOG_TCPSEQ         0x01    /* Log TCP sequence numbers */
 #define IP6T_LOG_TCPOPT         0x02    /* Log TCP options */
 #define IP6T_LOG_IPOPT          0x04    /* Log IP options */
diff --git a/include/linux/netfilter_ipv6/ip6t_REJECT.h b/include/linux/netfilter_ipv6/ip6t_REJECT.h
new file mode 100644
index 000000000000..6be6504162bb
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_REJECT.h
@@ -0,0 +1,18 @@
+#ifndef _IP6T_REJECT_H
+#define _IP6T_REJECT_H
+enum ip6t_reject_with {
+        IP6T_ICMP6_NO_ROUTE,
+        IP6T_ICMP6_ADM_PROHIBITED,
+        IP6T_ICMP6_NOT_NEIGHBOUR,
+        IP6T_ICMP6_ADDR_UNREACH,
+        IP6T_ICMP6_PORT_UNREACH,
+        IP6T_ICMP6_ECHOREPLY,
+        IP6T_TCP_RESET
+};
+struct ip6t_reject_info {
+        u_int32_t       with;   /* reject type */
+};
+#endif /*_IP6T_REJECT_H*/
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 27e4d164a108..167518668936 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -5,21 +5,20 @@
 #include <linux/types.h>
 #define NETLINK_ROUTE           0       /* Routing/device hook                          */
-#define NETLINK_SKIP            1       /* Reserved for ENskip                          */
+#define NETLINK_W1              1       /* 1-wire subsystem                             */
 #define NETLINK_USERSOCK        2       /* Reserved for user mode socket protocols      */
 #define NETLINK_FIREWALL        3       /* Firewalling hook                             */
-#define NETLINK_TCPDIAG         4       /* TCP socket monitoring                        */
+#define NETLINK_INET_DIAG       4       /* INET socket monitoring                       */
 #define NETLINK_NFLOG           5       /* netfilter/iptables ULOG */
 #define NETLINK_XFRM            6       /* ipsec */
 #define NETLINK_SELINUX         7       /* SELinux event notifications */
-#define NETLINK_ARPD            8
+#define NETLINK_ISCSI           8       /* Open-iSCSI */
 #define NETLINK_AUDIT           9       /* auditing */
 #define NETLINK_FIB_LOOKUP      10      
-#define NETLINK_ROUTE6          11      /* af_inet6 route comm channel */
+#define NETLINK_NETFILTER       12      /* netfilter subsystem */
 #define NETLINK_IP6_FW          13
 #define NETLINK_DNRTMSG         14      /* DECnet routing messages */
 #define NETLINK_KOBJECT_UEVENT  15      /* Kernel messages to userspace */
-#define NETLINK_TAPBASE         16      /* 16 to 31 are ethertap */
 #define MAX_LINKS 32            
@@ -91,6 +90,15 @@ struct nlmsgerr
        struct nlmsghdr msg;
 };
+#define NETLINK_ADD_MEMBERSHIP  1
+#define NETLINK_DROP_MEMBERSHIP 2
+#define NETLINK_PKTINFO         3
+struct nl_pktinfo
+{
+        __u32   group;
+};
 #define NET_MAJOR 36            /* Major 36 is reserved for networking                                          */
 enum {
@@ -107,9 +115,8 @@ struct netlink_skb_parms
 {
        struct ucred            creds;          /* Skb credentials      */
        __u32                   pid;
-        __u32                   groups;
        __u32                   dst_pid;
-        __u32                   dst_groups;
+        __u32                   dst_group;
        kernel_cap_t            eff_cap;
        __u32                   loginuid;       /* Login (audit) uid */
 };
@@ -118,11 +125,11 @@ struct netlink_skb_parms
 #define NETLINK_CREDS(skb)      (&NETLINK_CB((skb)).creds)
-extern struct sock *netlink_kernel_create(int unit, void (*input)(struct sock *sk, int len));
+extern struct sock *netlink_kernel_create(int unit, unsigned int groups, void (*input)(struct sock *sk, int len), struct module *module);
 extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
 extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 pid, int nonblock);
 extern int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 pid,
-                             __u32 group, int allocation);
+                             __u32 group, unsigned int __nocast allocation);
 extern void netlink_set_err(struct sock *ssk, __u32 pid, __u32 group, int code);
 extern int netlink_register_notifier(struct notifier_block *nb);
 extern int netlink_unregister_notifier(struct notifier_block *nb);
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index bcd0ac33f592..5ade54a78dbb 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -9,6 +9,7 @@
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
+#include <linux/rcupdate.h>
 #include <linux/list.h>
 struct netpoll;
@@ -26,6 +27,7 @@ struct netpoll {
 struct netpoll_info {
        spinlock_t poll_lock;
        int poll_owner;
+        int tries;
        int rx_flags;
        spinlock_t rx_lock;
        struct netpoll *rx_np; /* netpoll that registered an rx_hook */
@@ -60,25 +62,31 @@ static inline int netpoll_rx(struct sk_buff *skb)
        return ret;
 }
-static inline void netpoll_poll_lock(struct net_device *dev)
+static inline void *netpoll_poll_lock(struct net_device *dev)
 {
+        rcu_read_lock(); /* deal with race on ->npinfo */
        if (dev->npinfo) {
                spin_lock(&dev->npinfo->poll_lock);
                dev->npinfo->poll_owner = smp_processor_id();
+                return dev->npinfo;
        }
+        return NULL;
 }
-static inline void netpoll_poll_unlock(struct net_device *dev)
+static inline void netpoll_poll_unlock(void *have)
 {
-        if (dev->npinfo) {
+        struct netpoll_info *npi = have;
-                dev->npinfo->poll_owner = -1;
-                spin_unlock(&dev->npinfo->poll_lock);
+        if (npi) {
+                npi->poll_owner = -1;
+                spin_unlock(&npi->poll_lock);
        }
+        rcu_read_unlock();
 }
 #else
 #define netpoll_rx(a) 0
-#define netpoll_poll_lock(a)
+#define netpoll_poll_lock(a) 0
 #define netpoll_poll_unlock(a)
 #endif
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 8ea249110fb0..9a6047ff1b25 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -112,7 +112,8 @@ struct nfs_inode {
        /*
         * Various flags
         */
-        unsigned int            flags;
+        unsigned long           flags;                  /* atomic bit ops */
+        unsigned long           cache_validity;         /* bit mask */
        /*
         * read_cache_jiffies is when we started read-caching this inode,
@@ -174,8 +175,6 @@ struct nfs_inode {
        /* Open contexts for shared mmap writes */
        struct list_head        open_files;
-        wait_queue_head_t       nfs_i_wait;
 #ifdef CONFIG_NFS_V4
        struct nfs4_cached_acl  *nfs4_acl;
        /* NFSv4 state */
@@ -188,17 +187,21 @@ struct nfs_inode {
 };
 /*
- * Legal inode flag values
+ * Cache validity bit flags
 */
-#define NFS_INO_STALE           0x0001          /* possible stale inode */
+#define NFS_INO_INVALID_ATTR    0x0001          /* cached attrs are invalid */
-#define NFS_INO_ADVISE_RDPLUS   0x0002          /* advise readdirplus */
+#define NFS_INO_INVALID_DATA    0x0002          /* cached data is invalid */
-#define NFS_INO_REVALIDATING    0x0004          /* revalidating attrs */
+#define NFS_INO_INVALID_ATIME   0x0004          /* cached atime is invalid */
-#define NFS_INO_INVALID_ATTR    0x0008          /* cached attrs are invalid */
+#define NFS_INO_INVALID_ACCESS  0x0008          /* cached access cred invalid */
-#define NFS_INO_INVALID_DATA    0x0010          /* cached data is invalid */
+#define NFS_INO_INVALID_ACL     0x0010          /* cached acls are invalid */
-#define NFS_INO_INVALID_ATIME   0x0020          /* cached atime is invalid */
+#define NFS_INO_REVAL_PAGECACHE 0x0020          /* must revalidate pagecache */
-#define NFS_INO_INVALID_ACCESS  0x0040          /* cached access cred invalid */
-#define NFS_INO_INVALID_ACL     0x0080          /* cached acls are invalid */
+/*
-#define NFS_INO_REVAL_PAGECACHE 0x1000          /* must revalidate pagecache */
+ * Bit offsets in flags field
+ */
+#define NFS_INO_REVALIDATING    (0)             /* revalidating attrs */
+#define NFS_INO_ADVISE_RDPLUS   (1)             /* advise readdirplus */
+#define NFS_INO_STALE           (2)             /* possible stale inode */
 static inline struct nfs_inode *NFS_I(struct inode *inode)
 {
@@ -224,8 +227,7 @@ static inline struct nfs_inode *NFS_I(struct inode *inode)
 #define NFS_ATTRTIMEO_UPDATE(inode)     (NFS_I(inode)->attrtimeo_timestamp)
 #define NFS_FLAGS(inode)                (NFS_I(inode)->flags)
-#define NFS_REVALIDATING(inode)         (NFS_FLAGS(inode) & NFS_INO_REVALIDATING)
+#define NFS_STALE(inode)                (test_bit(NFS_INO_STALE, &NFS_FLAGS(inode)))
-#define NFS_STALE(inode)                (NFS_FLAGS(inode) & NFS_INO_STALE)
 #define NFS_FILEID(inode)               (NFS_I(inode)->fileid)
@@ -236,8 +238,11 @@ static inline int nfs_caches_unstable(struct inode *inode)
 static inline void NFS_CACHEINV(struct inode *inode)
 {
-        if (!nfs_caches_unstable(inode))
+        if (!nfs_caches_unstable(inode)) {
-                NFS_FLAGS(inode) |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;
+                spin_lock(&inode->i_lock);
+                NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;
+                spin_unlock(&inode->i_lock);
+        }
 }
 static inline int nfs_server_capable(struct inode *inode, int cap)
@@ -247,7 +252,7 @@ static inline int nfs_server_capable(struct inode *inode, int cap)
 static inline int NFS_USE_READDIRPLUS(struct inode *inode)
 {
-        return NFS_FLAGS(inode) & NFS_INO_ADVISE_RDPLUS;
+        return test_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));
 }
 /**
@@ -292,6 +297,7 @@ extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);
 extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);
 extern void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping);
 extern int nfs_setattr(struct dentry *, struct iattr *);
+extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr);
 extern void nfs_begin_attr_update(struct inode *);
 extern void nfs_end_attr_update(struct inode *);
 extern void nfs_begin_data_update(struct inode *);
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index f5a6695d4d21..f34767c5fc79 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -134,6 +134,7 @@ struct page_state {
 };
 extern void get_page_state(struct page_state *ret);
+extern void get_page_state_node(struct page_state *ret, int node);
 extern void get_full_page_state(struct page_state *ret);
 extern unsigned long __read_page_state(unsigned long offset);
 extern void __mod_page_state(unsigned long offset, unsigned long delta);
@@ -194,6 +195,7 @@ extern void __mod_page_state(unsigned long offset, unsigned long delta);
 #define SetPageDirty(page)      set_bit(PG_dirty, &(page)->flags)
 #define TestSetPageDirty(page)  test_and_set_bit(PG_dirty, &(page)->flags)
 #define ClearPageDirty(page)    clear_bit(PG_dirty, &(page)->flags)
+#define __ClearPageDirty(page)  __clear_bit(PG_dirty, &(page)->flags)
 #define TestClearPageDirty(page) test_and_clear_bit(PG_dirty, &(page)->flags)
 #define SetPageLRU(page)        set_bit(PG_lru, &(page)->flags)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7ac14961ba22..bc4c40000c0d 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -556,7 +556,8 @@ struct pci_dev {
        /* keep track of device state */
        unsigned int    is_enabled:1;   /* pci_enable_device has been called */
        unsigned int    is_busmaster:1; /* device is busmaster */
-        
+        unsigned int    no_msi:1;       /* device may not use msi */
        u32             saved_config_space[16]; /* config space saved at suspend time */
        struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */
        int rom_attr_enabled;           /* has display of the rom attribute been enabled? */
@@ -971,6 +972,8 @@ static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int en
 #define isa_bridge      ((struct pci_dev *)NULL)
+#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
 #else
 /*
@@ -985,9 +988,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
        return 0;
 }
 #endif
-#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
 #endif /* !CONFIG_PCI */
 /* these helpers provide future and backwards compatibility
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 27348c22dacb..95c941f8c747 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -881,7 +881,7 @@
 #define PCI_DEVICE_ID_APPLE_UNI_N_PCI15 0x002e
 #define PCI_DEVICE_ID_APPLE_UNI_N_FW2   0x0030
 #define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2 0x0032
-#define PCI_DEVIEC_ID_APPLE_UNI_N_ATA   0x0033
+#define PCI_DEVICE_ID_APPLE_UNI_N_ATA   0x0033
 #define PCI_DEVICE_ID_APPLE_UNI_N_AGP2  0x0034
 #define PCI_DEVICE_ID_APPLE_IPID_ATA100 0x003b
 #define PCI_DEVICE_ID_APPLE_KEYLARGO_I  0x003e
@@ -911,6 +911,15 @@
 #define PCI_DEVICE_ID_QLOGIC_ISP1022    0x1022
 #define PCI_DEVICE_ID_QLOGIC_ISP2100    0x2100
 #define PCI_DEVICE_ID_QLOGIC_ISP2200    0x2200
+#define PCI_DEVICE_ID_QLOGIC_ISP2300    0x2300
+#define PCI_DEVICE_ID_QLOGIC_ISP2312    0x2312
+#define PCI_DEVICE_ID_QLOGIC_ISP2322    0x2322
+#define PCI_DEVICE_ID_QLOGIC_ISP6312    0x6312
+#define PCI_DEVICE_ID_QLOGIC_ISP6322    0x6322
+#define PCI_DEVICE_ID_QLOGIC_ISP2422    0x2422
+#define PCI_DEVICE_ID_QLOGIC_ISP2432    0x2432
+#define PCI_DEVICE_ID_QLOGIC_ISP2512    0x2512
+#define PCI_DEVICE_ID_QLOGIC_ISP2522    0x2522
 #define PCI_VENDOR_ID_CYRIX             0x1078
 #define PCI_DEVICE_ID_CYRIX_5510        0x0000
@@ -1011,6 +1020,7 @@
 #define PCI_DEVICE_ID_PLX_SPCOM200      0x1103
 #define PCI_DEVICE_ID_PLX_DJINN_ITOO    0x1151
 #define PCI_DEVICE_ID_PLX_R753          0x1152
+#define PCI_DEVICE_ID_PLX_OLITEC        0x1187
 #define PCI_DEVICE_ID_PLX_9030          0x9030
 #define PCI_DEVICE_ID_PLX_9050          0x9050
 #define PCI_DEVICE_ID_PLX_9060          0x9060
@@ -1239,6 +1249,7 @@
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA  0x0266
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2 0x0267
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE   0x036E
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA  0x036F
 #define PCI_DEVICE_ID_NVIDIA_NVENET_12          0x0268
 #define PCI_DEVICE_ID_NVIDIA_NVENET_13          0x0269
 #define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO        0x026B
@@ -1570,6 +1581,7 @@
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
 #define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213
+#define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
 #define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB
@@ -1872,6 +1884,7 @@
 #define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001
 #define PCI_VENDOR_ID_SIIG              0x131f
+#define PCI_SUBVENDOR_ID_SIIG           0x131f
 #define PCI_DEVICE_ID_SIIG_1S_10x_550   0x1000
 #define PCI_DEVICE_ID_SIIG_1S_10x_650   0x1001
 #define PCI_DEVICE_ID_SIIG_1S_10x_850   0x1002
@@ -1909,6 +1922,7 @@
 #define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060
 #define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061
 #define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062
+#define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL    0x2050
 #define PCI_VENDOR_ID_RADISYS           0x1331
 #define PCI_DEVICE_ID_RADISYS_ENP2611   0x0030
@@ -2096,6 +2110,8 @@
 #define PCI_DEVICE_ID_TIGON3_5721       0x1659
 #define PCI_DEVICE_ID_TIGON3_5705M      0x165d
 #define PCI_DEVICE_ID_TIGON3_5705M_2    0x165e
+#define PCI_DEVICE_ID_TIGON3_5780       0x166a
+#define PCI_DEVICE_ID_TIGON3_5780S      0x166b
 #define PCI_DEVICE_ID_TIGON3_5705F      0x166e
 #define PCI_DEVICE_ID_TIGON3_5750       0x1676
 #define PCI_DEVICE_ID_TIGON3_5751       0x1677
@@ -2129,6 +2145,10 @@
 #define PCI_DEVICE_ID_ENE_1225          0x1225
 #define PCI_DEVICE_ID_ENE_1410          0x1410
 #define PCI_DEVICE_ID_ENE_1420          0x1420
+#define PCI_VENDOR_ID_CHELSIO           0x1425
+#define PCI_VENDOR_ID_MIPS              0x153f
+#define PCI_DEVICE_ID_SOC_IT            0x0001
 #define PCI_VENDOR_ID_SYBA              0x1592
 #define PCI_DEVICE_ID_SYBA_2P_EPP       0x0782
@@ -2170,6 +2190,9 @@
 #define PCI_VENDOR_ID_SIBYTE            0x166d
 #define PCI_DEVICE_ID_BCM1250_HT        0x0002
+#define PCI_VENDOR_ID_NETCELL           0x169c
+#define PCI_DEVICE_ID_REVOLUTION        0x0044
 #define PCI_VENDOR_ID_LINKSYS           0x1737
 #define PCI_DEVICE_ID_LINKSYS_EG1032    0x1032
 #define PCI_DEVICE_ID_LINKSYS_EG1064    0x1064
@@ -2267,6 +2290,11 @@
 #define PCI_VENDOR_ID_INTEL             0x8086
 #define PCI_DEVICE_ID_INTEL_EESSC       0x0008
 #define PCI_DEVICE_ID_INTEL_21145       0x0039
+#define PCI_DEVICE_ID_INTEL_PXHD_0      0x0320
+#define PCI_DEVICE_ID_INTEL_PXHD_1      0x0321
+#define PCI_DEVICE_ID_INTEL_PXH_0       0x0329
+#define PCI_DEVICE_ID_INTEL_PXH_1       0x032A
+#define PCI_DEVICE_ID_INTEL_PXHV        0x032C
 #define PCI_DEVICE_ID_INTEL_82375       0x0482
 #define PCI_DEVICE_ID_INTEL_82424       0x0483
 #define PCI_DEVICE_ID_INTEL_82378       0x0484
diff --git a/include/linux/phy.h b/include/linux/phy.h
new file mode 100644
index 000000000000..72cb67b66e0c
--- /dev/null
+++ b/include/linux/phy.h
@@ -0,0 +1,377 @@
+/*
+ * include/linux/phy.h
+ *
+ * Framework and drivers for configuring and reading different PHYs
+ * Based on code in sungem_phy.c and gianfar_phy.c
+ *
+ * Author: Andy Fleming
+ *
+ * Copyright (c) 2004 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#ifndef __PHY_H
+#define __PHY_H
+#include <linux/spinlock.h>
+#include <linux/device.h>
+#define PHY_BASIC_FEATURES      (SUPPORTED_10baseT_Half | \
+                                 SUPPORTED_10baseT_Full | \
+                                 SUPPORTED_100baseT_Half | \
+                                 SUPPORTED_100baseT_Full | \
+                                 SUPPORTED_Autoneg | \
+                                 SUPPORTED_TP | \
+                                 SUPPORTED_MII)
+#define PHY_GBIT_FEATURES       (PHY_BASIC_FEATURES | \
+                                 SUPPORTED_1000baseT_Half | \
+                                 SUPPORTED_1000baseT_Full)
+/* Set phydev->irq to PHY_POLL if interrupts are not supported,
+ * or not desired for this PHY.  Set to PHY_IGNORE_INTERRUPT if
+ * the attached driver handles the interrupt
+ */
+#define PHY_POLL                -1
+#define PHY_IGNORE_INTERRUPT    -2
+#define PHY_HAS_INTERRUPT       0x00000001
+#define PHY_HAS_MAGICANEG       0x00000002
+#define MII_BUS_MAX 4
+#define PHY_INIT_TIMEOUT 100000
+#define PHY_STATE_TIME          1
+#define PHY_FORCE_TIMEOUT       10
+#define PHY_AN_TIMEOUT          10
+#define PHY_MAX_ADDR 32
+/* The Bus class for PHYs.  Devices which provide access to
+ * PHYs should register using this structure */
+struct mii_bus {
+        const char *name;
+        int id;
+        void *priv;
+        int (*read)(struct mii_bus *bus, int phy_id, int regnum);
+        int (*write)(struct mii_bus *bus, int phy_id, int regnum, u16 val);
+        int (*reset)(struct mii_bus *bus);
+        /* A lock to ensure that only one thing can read/write
+         * the MDIO bus at a time */
+        spinlock_t mdio_lock;
+        struct device *dev;
+        /* list of all PHYs on bus */
+        struct phy_device *phy_map[PHY_MAX_ADDR];
+        /* Pointer to an array of interrupts, each PHY's
+         * interrupt at the index matching its address */
+        int *irq;
+};
+#define PHY_INTERRUPT_DISABLED 0x0
+#define PHY_INTERRUPT_ENABLED 0x80000000
+/* PHY state machine states:
+ *
+ * DOWN: PHY device and driver are not ready for anything.  probe
+ * should be called if and only if the PHY is in this state,
+ * given that the PHY device exists.
+ * - PHY driver probe function will, depending on the PHY, set
+ * the state to STARTING or READY
+ *
+ * STARTING:  PHY device is coming up, and the ethernet driver is
+ * not ready.  PHY drivers may set this in the probe function.
+ * If they do, they are responsible for making sure the state is
+ * eventually set to indicate whether the PHY is UP or READY,
+ * depending on the state when the PHY is done starting up.
+ * - PHY driver will set the state to READY
+ * - start will set the state to PENDING
+ *
+ * READY: PHY is ready to send and receive packets, but the
+ * controller is not.  By default, PHYs which do not implement
+ * probe will be set to this state by phy_probe().  If the PHY
+ * driver knows the PHY is ready, and the PHY state is STARTING,
+ * then it sets this STATE.
+ * - start will set the state to UP
+ *
+ * PENDING: PHY device is coming up, but the ethernet driver is
+ * ready.  phy_start will set this state if the PHY state is
+ * STARTING.
+ * - PHY driver will set the state to UP when the PHY is ready
+ *
+ * UP: The PHY and attached device are ready to do work.
+ * Interrupts should be started here.
+ * - timer moves to AN
+ *
+ * AN: The PHY is currently negotiating the link state.  Link is
+ * therefore down for now.  phy_timer will set this state when it
+ * detects the state is UP.  config_aneg will set this state
+ * whenever called with phydev->autoneg set to AUTONEG_ENABLE.
+ * - If autonegotiation finishes, but there's no link, it sets
+ *   the state to NOLINK.
+ * - If aneg finishes with link, it sets the state to RUNNING,
+ *   and calls adjust_link
+ * - If autonegotiation did not finish after an arbitrary amount
+ *   of time, autonegotiation should be tried again if the PHY
+ *   supports "magic" autonegotiation (back to AN)
+ * - If it didn't finish, and no magic_aneg, move to FORCING.
+ *
+ * NOLINK: PHY is up, but not currently plugged in.
+ * - If the timer notes that the link comes back, we move to RUNNING
+ * - config_aneg moves to AN
+ * - phy_stop moves to HALTED
+ *
+ * FORCING: PHY is being configured with forced settings
+ * - if link is up, move to RUNNING
+ * - If link is down, we drop to the next highest setting, and
+ *   retry (FORCING) after a timeout
+ * - phy_stop moves to HALTED
+ *
+ * RUNNING: PHY is currently up, running, and possibly sending
+ * and/or receiving packets
+ * - timer will set CHANGELINK if we're polling (this ensures the
+ *   link state is polled every other cycle of this state machine,
+ *   which makes it every other second)
+ * - irq will set CHANGELINK
+ * - config_aneg will set AN
+ * - phy_stop moves to HALTED
+ *
+ * CHANGELINK: PHY experienced a change in link state
+ * - timer moves to RUNNING if link
+ * - timer moves to NOLINK if the link is down
+ * - phy_stop moves to HALTED
+ *
+ * HALTED: PHY is up, but no polling or interrupts are done. Or
+ * PHY is in an error state.
+ *
+ * - phy_start moves to RESUMING
+ *
+ * RESUMING: PHY was halted, but now wants to run again.
+ * - If we are forcing, or aneg is done, timer moves to RUNNING
+ * - If aneg is not done, timer moves to AN
+ * - phy_stop moves to HALTED
+ */
+enum phy_state {
+        PHY_DOWN=0,
+        PHY_STARTING,
+        PHY_READY,
+        PHY_PENDING,
+        PHY_UP,
+        PHY_AN,
+        PHY_RUNNING,
+        PHY_NOLINK,
+        PHY_FORCING,
+        PHY_CHANGELINK,
+        PHY_HALTED,
+        PHY_RESUMING
+};
+/* phy_device: An instance of a PHY
+ *
+ * drv: Pointer to the driver for this PHY instance
+ * bus: Pointer to the bus this PHY is on
+ * dev: driver model device structure for this PHY
+ * phy_id: UID for this device found during discovery
+ * state: state of the PHY for management purposes
+ * dev_flags: Device-specific flags used by the PHY driver.
+ * addr: Bus address of PHY
+ * link_timeout: The number of timer firings to wait before the
+ * giving up on the current attempt at acquiring a link
+ * irq: IRQ number of the PHY's interrupt (-1 if none)
+ * phy_timer: The timer for handling the state machine
+ * phy_queue: A work_queue for the interrupt
+ * attached_dev: The attached enet driver's device instance ptr
+ * adjust_link: Callback for the enet controller to respond to
+ * changes in the link state.
+ * adjust_state: Callback for the enet driver to respond to
+ * changes in the state machine.
+ *
+ * speed, duplex, pause, supported, advertising, and
+ * autoneg are used like in mii_if_info
+ *
+ * interrupts currently only supports enabled or disabled,
+ * but could be changed in the future to support enabling
+ * and disabling specific interrupts
+ *
+ * Contains some infrastructure for polling and interrupt
+ * handling, as well as handling shifts in PHY hardware state
+ */
+struct phy_device {
+        /* Information about the PHY type */
+        /* And management functions */
+        struct phy_driver *drv;
+        struct mii_bus *bus;
+        struct device dev;
+        u32 phy_id;
+        enum phy_state state;
+        u32 dev_flags;
+        /* Bus address of the PHY (0-32) */
+        int addr;
+        /* forced speed & duplex (no autoneg)
+         * partner speed & duplex & pause (autoneg)
+         */
+        int speed;
+        int duplex;
+        int pause;
+        int asym_pause;
+        /* The most recently read link state */
+        int link;
+        /* Enabled Interrupts */
+        u32 interrupts;
+        /* Union of PHY and Attached devices' supported modes */
+        /* See mii.h for more info */
+        u32 supported;
+        u32 advertising;
+        int autoneg;
+        int link_timeout;
+        /* Interrupt number for this PHY
+         * -1 means no interrupt */
+        int irq;
+        /* private data pointer */
+        /* For use by PHYs to maintain extra state */
+        void *priv;
+        /* Interrupt and Polling infrastructure */
+        struct work_struct phy_queue;
+        struct timer_list phy_timer;
+        spinlock_t lock;
+        struct net_device *attached_dev;
+        void (*adjust_link)(struct net_device *dev);
+        void (*adjust_state)(struct net_device *dev);
+};
+#define to_phy_device(d) container_of(d, struct phy_device, dev)
+/* struct phy_driver: Driver structure for a particular PHY type
+ *
+ * phy_id: The result of reading the UID registers of this PHY
+ *   type, and ANDing them with the phy_id_mask.  This driver
+ *   only works for PHYs with IDs which match this field
+ * name: The friendly name of this PHY type
+ * phy_id_mask: Defines the important bits of the phy_id
+ * features: A list of features (speed, duplex, etc) supported
+ *   by this PHY
+ * flags: A bitfield defining certain other features this PHY
+ *   supports (like interrupts)
+ *
+ * The drivers must implement config_aneg and read_status.  All
+ * other functions are optional. Note that none of these
+ * functions should be called from interrupt time.  The goal is
+ * for the bus read/write functions to be able to block when the
+ * bus transaction is happening, and be freed up by an interrupt
+ * (The MPC85xx has this ability, though it is not currently
+ * supported in the driver).
+ */
+struct phy_driver {
+        u32 phy_id;
+        char *name;
+        unsigned int phy_id_mask;
+        u32 features;
+        u32 flags;
+        /* Called to initialize the PHY,
+         * including after a reset */
+        int (*config_init)(struct phy_device *phydev);
+        /* Called during discovery.  Used to set
+         * up device-specific structures, if any */
+        int (*probe)(struct phy_device *phydev);
+        /* PHY Power Management */
+        int (*suspend)(struct phy_device *phydev);
+        int (*resume)(struct phy_device *phydev);
+        /* Configures the advertisement and resets
+         * autonegotiation if phydev->autoneg is on,
+         * forces the speed to the current settings in phydev
+         * if phydev->autoneg is off */
+        int (*config_aneg)(struct phy_device *phydev);
+        /* Determines the negotiated speed and duplex */
+        int (*read_status)(struct phy_device *phydev);
+        /* Clears any pending interrupts */
+        int (*ack_interrupt)(struct phy_device *phydev);
+        /* Enables or disables interrupts */
+        int (*config_intr)(struct phy_device *phydev);
+        /* Clears up any memory if needed */
+        void (*remove)(struct phy_device *phydev);
+        struct device_driver driver;
+};
+#define to_phy_driver(d) container_of(d, struct phy_driver, driver)
+int phy_read(struct phy_device *phydev, u16 regnum);
+int phy_write(struct phy_device *phydev, u16 regnum, u16 val);
+struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
+int phy_clear_interrupt(struct phy_device *phydev);
+int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);
+struct phy_device * phy_attach(struct net_device *dev,
+                const char *phy_id, u32 flags);
+struct phy_device * phy_connect(struct net_device *dev, const char *phy_id,
+                void (*handler)(struct net_device *), u32 flags);
+void phy_disconnect(struct phy_device *phydev);
+void phy_detach(struct phy_device *phydev);
+void phy_start(struct phy_device *phydev);
+void phy_stop(struct phy_device *phydev);
+int phy_start_aneg(struct phy_device *phydev);
+int mdiobus_register(struct mii_bus *bus);
+void mdiobus_unregister(struct mii_bus *bus);
+void phy_sanitize_settings(struct phy_device *phydev);
+int phy_stop_interrupts(struct phy_device *phydev);
+static inline int phy_read_status(struct phy_device *phydev) {
+        return phydev->drv->read_status(phydev);
+}
+int genphy_config_advert(struct phy_device *phydev);
+int genphy_setup_forced(struct phy_device *phydev);
+int genphy_restart_aneg(struct phy_device *phydev);
+int genphy_config_aneg(struct phy_device *phydev);
+int genphy_update_link(struct phy_device *phydev);
+int genphy_read_status(struct phy_device *phydev);
+void phy_driver_unregister(struct phy_driver *drv);
+int phy_driver_register(struct phy_driver *new_driver);
+void phy_prepare_link(struct phy_device *phydev,
+                void (*adjust_link)(struct net_device *));
+void phy_start_machine(struct phy_device *phydev,
+                void (*handler)(struct net_device *));
+void phy_stop_machine(struct phy_device *phydev);
+int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+int phy_mii_ioctl(struct phy_device *phydev,
+                struct mii_ioctl_data *mii_data, int cmd);
+int phy_start_interrupts(struct phy_device *phydev);
+void phy_print_status(struct phy_device *phydev);
+extern struct bus_type mdio_bus_type;
+#endif /* __PHY_H */
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 14479325e3f3..5cfb07648eca 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -176,7 +176,7 @@ struct pm_ops {
 };
 extern void pm_set_ops(struct pm_ops *);
+extern struct pm_ops *pm_ops;
 extern int pm_suspend(suspend_state_t state);
@@ -186,7 +186,9 @@ extern int pm_suspend(suspend_state_t state);
 struct device;
-typedef u32 __bitwise pm_message_t;
+typedef struct pm_message {
+        int event;
+} pm_message_t;
 /*
 * There are 4 important states driver can be in:
@@ -207,9 +209,13 @@ typedef u32 __bitwise pm_message_t;
 * or something similar soon.
 */
-#define PMSG_FREEZE     ((__force pm_message_t) 3)
+#define PM_EVENT_ON 0
-#define PMSG_SUSPEND    ((__force pm_message_t) 3)
+#define PM_EVENT_FREEZE 1
-#define PMSG_ON         ((__force pm_message_t) 0)
+#define PM_EVENT_SUSPEND 2
+#define PMSG_FREEZE     ((struct pm_message){ .event = PM_EVENT_FREEZE, })
+#define PMSG_SUSPEND    ((struct pm_message){ .event = PM_EVENT_SUSPEND, })
+#define PMSG_ON         ((struct pm_message){ .event = PM_EVENT_ON, })
 struct dev_pm_info {
        pm_message_t            power_state;
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index a373fc254df2..2afdafb62123 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -20,6 +20,8 @@
 #define PTRACE_DETACH           0x11
 #define PTRACE_SYSCALL            24
+#define PTRACE_SYSEMU             31
+#define PTRACE_SYSEMU_SINGLESTEP  32
 /* 0x4200-0x4300 are reserved for architecture-independent additions.  */
 #define PTRACE_SETOPTIONS       0x4200
diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h
index e24b74b11150..4bf1659f8aa8 100644
--- a/include/linux/raid/bitmap.h
+++ b/include/linux/raid/bitmap.h
@@ -248,6 +248,7 @@ struct bitmap {
 /* these are used only by md/bitmap */
 int  bitmap_create(mddev_t *mddev);
+void bitmap_flush(mddev_t *mddev);
 void bitmap_destroy(mddev_t *mddev);
 int  bitmap_active(struct bitmap *bitmap);
@@ -262,7 +263,7 @@ void bitmap_write_all(struct bitmap *bitmap);
 int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors);
 void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors,
                     int success);
-int bitmap_start_sync(struct bitmap *bitmap, sector_t offset, int *blocks);
+int bitmap_start_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int degraded);
 void bitmap_end_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int aborted);
 void bitmap_close_sync(struct bitmap *bitmap);
diff --git a/include/linux/random.h b/include/linux/random.h
index cc6703449916..7b2adb3322d5 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -59,6 +59,8 @@ extern __u32 secure_tcp_sequence_number(__u32 saddr, __u32 daddr,
                                        __u16 sport, __u16 dport);
 extern __u32 secure_tcpv6_sequence_number(__u32 *saddr, __u32 *daddr,
                                          __u16 sport, __u16 dport);
+extern u64 secure_dccp_sequence_number(__u32 saddr, __u32 daddr,
+                                       __u16 sport, __u16 dport);
 #ifndef MODULE
 extern struct file_operations random_fops, urandom_fops;
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 2d4dd23168dd..3b3266ff1a95 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -55,6 +55,22 @@ extern void machine_shutdown(void);
 struct pt_regs;
 extern void machine_crash_shutdown(struct pt_regs *);
+/* 
+ * Architecture independent implemenations of sys_reboot commands.
+ */
+extern void kernel_restart(char *cmd);
+extern void kernel_halt(void);
+extern void kernel_power_off(void);
+extern void kernel_kexec(void);
+/*
+ * Emergency restart, callable from an interrupt handler.
+ */
+extern void emergency_restart(void);
+#include <asm/emergency-restart.h>
 #endif
 #endif /* _LINUX_REBOOT_H */
diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h
index 0760507a545b..0a3605099c44 100644
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
@@ -4,29 +4,29 @@
 #define REISERFS_ACL_VERSION    0x0001
 typedef struct {
-        __le16          e_tag;
+        __le16 e_tag;
-        __le16          e_perm;
+        __le16 e_perm;
-        __le32          e_id;
+        __le32 e_id;
 } reiserfs_acl_entry;
 typedef struct {
-        __le16          e_tag;
+        __le16 e_tag;
-        __le16          e_perm;
+        __le16 e_perm;
 } reiserfs_acl_entry_short;
 typedef struct {
-        __le32          a_version;
+        __le32 a_version;
 } reiserfs_acl_header;
 static inline size_t reiserfs_acl_size(int count)
 {
        if (count <= 4) {
                return sizeof(reiserfs_acl_header) +
-                       count * sizeof(reiserfs_acl_entry_short);
+                    count * sizeof(reiserfs_acl_entry_short);
        } else {
                return sizeof(reiserfs_acl_header) +
-                       4 * sizeof(reiserfs_acl_entry_short) +
+                    4 * sizeof(reiserfs_acl_entry_short) +
-                       (count - 4) * sizeof(reiserfs_acl_entry);
+                    (count - 4) * sizeof(reiserfs_acl_entry);
        }
 }
@@ -46,14 +46,14 @@ static inline int reiserfs_acl_count(size_t size)
        }
 }
 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
-struct posix_acl * reiserfs_get_acl(struct inode *inode, int type);
+struct posix_acl *reiserfs_get_acl(struct inode *inode, int type);
-int reiserfs_acl_chmod (struct inode *inode);
+int reiserfs_acl_chmod(struct inode *inode);
-int reiserfs_inherit_default_acl (struct inode *dir, struct dentry *dentry, struct inode *inode);
+int reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry,
-int reiserfs_cache_default_acl (struct inode *dir);
+                                 struct inode *inode);
-extern int reiserfs_xattr_posix_acl_init (void) __init;
+int reiserfs_cache_default_acl(struct inode *dir);
-extern int reiserfs_xattr_posix_acl_exit (void);
+extern int reiserfs_xattr_posix_acl_init(void) __init;
+extern int reiserfs_xattr_posix_acl_exit(void);
 extern struct reiserfs_xattr_handler posix_acl_default_handler;
 extern struct reiserfs_xattr_handler posix_acl_access_handler;
 #else
@@ -61,28 +61,26 @@ extern struct reiserfs_xattr_handler posix_acl_access_handler;
 #define reiserfs_get_acl NULL
 #define reiserfs_cache_default_acl(inode) 0
-static inline int
+static inline int reiserfs_xattr_posix_acl_init(void)
-reiserfs_xattr_posix_acl_init (void)
 {
-    return 0;
+        return 0;
 }
-static inline int
+static inline int reiserfs_xattr_posix_acl_exit(void)
-reiserfs_xattr_posix_acl_exit (void)
 {
-    return 0;
+        return 0;
 }
-static inline int
+static inline int reiserfs_acl_chmod(struct inode *inode)
-reiserfs_acl_chmod (struct inode *inode)
 {
-    return 0;
+        return 0;
 }
 static inline int
-reiserfs_inherit_default_acl (const struct inode *dir, struct dentry *dentry, struct inode *inode)
+reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry,
+                             struct inode *inode)
 {
-    return 0;
+        return 0;
 }
 #endif
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 4c7c5689ad93..17e458e17e2b 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -3,11 +3,10 @@
 */
                                /* this file has an amazingly stupid
-                                   name, yura please fix it to be
+                                   name, yura please fix it to be
-                                   reiserfs.h, and merge all the rest
+                                   reiserfs.h, and merge all the rest
-                                   of our .h files that are in this
+                                   of our .h files that are in this
-                                   directory into it.  */
+                                   directory into it.  */
 #ifndef _LINUX_REISER_FS_H
 #define _LINUX_REISER_FS_H
@@ -74,9 +73,9 @@
 /* debug levels.  Right now, CONFIG_REISERFS_CHECK means print all debug
 ** messages.
 */
-#define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */ 
+#define REISERFS_DEBUG_CODE 5   /* extra messages to help find/debug errors */
-void reiserfs_warning (struct super_block *s, const char * fmt, ...);
+void reiserfs_warning(struct super_block *s, const char *fmt, ...);
 /* assertions handling */
 /** always check a condition and panic if it's false. */
@@ -105,82 +104,78 @@ if( !( cond ) ) 								\
 * Structure of super block on disk, a version of which in RAM is often accessed as REISERFS_SB(s)->s_rs
 * the version in RAM is part of a larger structure containing fields never written to disk.
 */
-#define UNSET_HASH 0 // read_super will guess about, what hash names
+#define UNSET_HASH 0            // read_super will guess about, what hash names
-                     // in directories were sorted with
+                     // in directories were sorted with
 #define TEA_HASH  1
 #define YURA_HASH 2
 #define R5_HASH   3
 #define DEFAULT_HASH R5_HASH
 struct journal_params {
-    __le32 jp_journal_1st_block;              /* where does journal start from on its
+        __le32 jp_journal_1st_block;    /* where does journal start from on its
-                                       * device */
+                                         * device */
-    __le32 jp_journal_dev;            /* journal device st_rdev */
+        __le32 jp_journal_dev;  /* journal device st_rdev */
-    __le32 jp_journal_size;           /* size of the journal */
+        __le32 jp_journal_size; /* size of the journal */
-    __le32 jp_journal_trans_max;              /* max number of blocks in a transaction. */
+        __le32 jp_journal_trans_max;    /* max number of blocks in a transaction. */
-    __le32 jp_journal_magic;          /* random value made on fs creation (this
+        __le32 jp_journal_magic;        /* random value made on fs creation (this
-                                       * was sb_journal_block_count) */
+                                         * was sb_journal_block_count) */
-    __le32 jp_journal_max_batch;              /* max number of blocks to batch into a
+        __le32 jp_journal_max_batch;    /* max number of blocks to batch into a
-                                       * trans */
+                                         * trans */
-    __le32 jp_journal_max_commit_age;  /* in seconds, how old can an async
+        __le32 jp_journal_max_commit_age;       /* in seconds, how old can an async
-                                       * commit be */
+                                                 * commit be */
-    __le32 jp_journal_max_trans_age;   /* in seconds, how old can a transaction
+        __le32 jp_journal_max_trans_age;        /* in seconds, how old can a transaction
-                                       * be */
+                                                 * be */
 };
 /* this is the super from 3.5.X, where X >= 10 */
-struct reiserfs_super_block_v1
+struct reiserfs_super_block_v1 {
-{
+        __le32 s_block_count;   /* blocks count         */
-    __le32 s_block_count;          /* blocks count         */
+        __le32 s_free_blocks;   /* free blocks count    */
-    __le32 s_free_blocks;           /* free blocks count    */
+        __le32 s_root_block;    /* root block number    */
-    __le32 s_root_block;            /* root block number    */
+        struct journal_params s_journal;
-    struct journal_params s_journal;
+        __le16 s_blocksize;     /* block size */
-    __le16 s_blocksize;             /* block size */
+        __le16 s_oid_maxsize;   /* max size of object id array, see
-    __le16 s_oid_maxsize;          /* max size of object id array, see
+                                 * get_objectid() commentary  */
-                                    * get_objectid() commentary  */
+        __le16 s_oid_cursize;   /* current size of object id array */
-    __le16 s_oid_cursize;          /* current size of object id array */
+        __le16 s_umount_state;  /* this is set to 1 when filesystem was
-    __le16 s_umount_state;          /* this is set to 1 when filesystem was
+                                 * umounted, to 2 - when not */
-                                    * umounted, to 2 - when not */    
+        char s_magic[10];       /* reiserfs magic string indicates that
-    char s_magic[10];              /* reiserfs magic string indicates that
+                                 * file system is reiserfs:
-                                    * file system is reiserfs:
+                                 * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */
-                                    * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */
+        __le16 s_fs_state;      /* it is set to used by fsck to mark which
-    __le16 s_fs_state;             /* it is set to used by fsck to mark which
+                                 * phase of rebuilding is done */
-                                    * phase of rebuilding is done */
+        __le32 s_hash_function_code;    /* indicate, what hash function is being use
-    __le32 s_hash_function_code;    /* indicate, what hash function is being use
+                                         * to sort names in a directory*/
-                                    * to sort names in a directory*/
+        __le16 s_tree_height;   /* height of disk tree */
-    __le16 s_tree_height;           /* height of disk tree */
+        __le16 s_bmap_nr;       /* amount of bitmap blocks needed to address
-    __le16 s_bmap_nr;               /* amount of bitmap blocks needed to address
+                                 * each block of file system */
-                                    * each block of file system */
+        __le16 s_version;       /* this field is only reliable on filesystem
-    __le16 s_version;               /* this field is only reliable on filesystem
+                                 * with non-standard journal */
-                                    * with non-standard journal */
+        __le16 s_reserved_for_journal;  /* size in blocks of journal area on main
-    __le16 s_reserved_for_journal;  /* size in blocks of journal area on main
+                                         * device, we need to keep after
-                                    * device, we need to keep after
+                                         * making fs with non-standard journal */
-                                    * making fs with non-standard journal */    
 } __attribute__ ((__packed__));
 #define SB_SIZE_V1 (sizeof(struct reiserfs_super_block_v1))
 /* this is the on disk super block */
-struct reiserfs_super_block
+struct reiserfs_super_block {
-{
+        struct reiserfs_super_block_v1 s_v1;
-    struct reiserfs_super_block_v1 s_v1;
+        __le32 s_inode_generation;
-    __le32 s_inode_generation;
+        __le32 s_flags;         /* Right now used only by inode-attributes, if enabled */
-    __le32 s_flags;                  /* Right now used only by inode-attributes, if enabled */
+        unsigned char s_uuid[16];       /* filesystem unique identifier */
-    unsigned char s_uuid[16];       /* filesystem unique identifier */
+        unsigned char s_label[16];      /* filesystem volume label */
-    unsigned char s_label[16];      /* filesystem volume label */
+        char s_unused[88];      /* zero filled by mkreiserfs and
-    char s_unused[88] ;             /* zero filled by mkreiserfs and
+                                 * reiserfs_convert_objectid_map_v1()
-                                     * reiserfs_convert_objectid_map_v1()
+                                 * so any additions must be updated
-                                     * so any additions must be updated
+                                 * there as well. */
-                                     * there as well. */
+} __attribute__ ((__packed__));
-}  __attribute__ ((__packed__));
 #define SB_SIZE (sizeof(struct reiserfs_super_block))
 #define REISERFS_VERSION_1 0
 #define REISERFS_VERSION_2 2
 // on-disk super block fields converted to cpu form
 #define SB_DISK_SUPER_BLOCK(s) (REISERFS_SB(s)->s_rs)
 #define SB_V1_DISK_SUPER_BLOCK(s) (&(SB_DISK_SUPER_BLOCK(s)->s_v1))
@@ -210,13 +205,12 @@ struct reiserfs_super_block
 #define PUT_SB_TREE_HEIGHT(s, val) \
   do { SB_V1_DISK_SUPER_BLOCK(s)->s_tree_height = cpu_to_le16(val); } while (0)
 #define PUT_SB_REISERFS_STATE(s, val) \
-   do { SB_V1_DISK_SUPER_BLOCK(s)->s_umount_state = cpu_to_le16(val); } while (0) 
+   do { SB_V1_DISK_SUPER_BLOCK(s)->s_umount_state = cpu_to_le16(val); } while (0)
 #define PUT_SB_VERSION(s, val) \
   do { SB_V1_DISK_SUPER_BLOCK(s)->s_version = cpu_to_le16(val); } while (0)
 #define PUT_SB_BMAP_NR(s, val) \
   do { SB_V1_DISK_SUPER_BLOCK(s)->s_bmap_nr = cpu_to_le16 (val); } while (0)
 #define SB_ONDISK_JP(s) (&SB_V1_DISK_SUPER_BLOCK(s)->s_journal)
 #define SB_ONDISK_JOURNAL_SIZE(s) \
         le32_to_cpu ((SB_ONDISK_JP(s)->jp_journal_size))
@@ -231,21 +225,19 @@ struct reiserfs_super_block
         block >= SB_JOURNAL_1st_RESERVED_BLOCK(s) \
         && block < SB_JOURNAL_1st_RESERVED_BLOCK(s) +  \
         ((!is_reiserfs_jr(SB_DISK_SUPER_BLOCK(s)) ? \
-         SB_ONDISK_JOURNAL_SIZE(s) + 1 : SB_ONDISK_RESERVED_FOR_JOURNAL(s))) 
+         SB_ONDISK_JOURNAL_SIZE(s) + 1 : SB_ONDISK_RESERVED_FOR_JOURNAL(s)))
                                /* used by gcc */
 #define REISERFS_SUPER_MAGIC 0x52654973
                                /* used by file system utilities that
-                                   look at the superblock, etc. */
+                                   look at the superblock, etc. */
 #define REISERFS_SUPER_MAGIC_STRING "ReIsErFs"
 #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
 #define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
-int is_reiserfs_3_5 (struct reiserfs_super_block * rs);
+int is_reiserfs_3_5(struct reiserfs_super_block *rs);
-int is_reiserfs_3_6 (struct reiserfs_super_block * rs);
+int is_reiserfs_3_6(struct reiserfs_super_block *rs);
-int is_reiserfs_jr (struct reiserfs_super_block * rs);
+int is_reiserfs_jr(struct reiserfs_super_block *rs);
 /* ReiserFS leaves the first 64k unused, so that partition labels have
   enough space.  If someone wants to write a fancy bootloader that
@@ -272,8 +264,8 @@ typedef __u32 b_blocknr_t;
 typedef __le32 unp_t;
 struct unfm_nodeinfo {
-    unp_t unfm_nodenum;
+        unp_t unfm_nodenum;
-    unsigned short unfm_freespace;
+        unsigned short unfm_freespace;
 };
 /* there are two formats of keys: 3.5 and 3.6
@@ -285,7 +277,6 @@ struct unfm_nodeinfo {
 #define STAT_DATA_V1 0
 #define STAT_DATA_V2 1
 static inline struct reiserfs_inode_info *REISERFS_I(const struct inode *inode)
 {
        return container_of(inode, struct reiserfs_inode_info, vfs_inode);
@@ -343,15 +334,13 @@ static inline struct reiserfs_sb_info *REISERFS_SB(const struct super_block *sb)
   file would fit into one DIRECT item.
   Primary intention for this one is to increase performance by decreasing
   seeking.
-*/   
+*/
 #define STORE_TAIL_IN_UNFM_S2(n_file_size,n_tail_size,n_block_size) \
 (\
  (!(n_tail_size)) || \
  (((n_file_size) > MAX_DIRECT_ITEM_LEN(n_block_size)) ) \
 )
 /*
 * values for s_umount_state field
 */
@@ -364,9 +353,9 @@ static inline struct reiserfs_sb_info *REISERFS_SB(const struct super_block *sb)
 #define TYPE_STAT_DATA 0
 #define TYPE_INDIRECT 1
 #define TYPE_DIRECT 2
-#define TYPE_DIRENTRY 3 
+#define TYPE_DIRENTRY 3
-#define TYPE_MAXTYPE 3 
+#define TYPE_MAXTYPE 3
-#define TYPE_ANY 15 // FIXME: comment is required
+#define TYPE_ANY 15             // FIXME: comment is required
 /***************************************************************************/
 /*                       KEY & ITEM HEAD                                   */
@@ -376,60 +365,62 @@ static inline struct reiserfs_sb_info *REISERFS_SB(const struct super_block *sb)
 // directories use this key as well as old files
 //
 struct offset_v1 {
-    __le32 k_offset;
+        __le32 k_offset;
-    __le32 k_uniqueness;
+        __le32 k_uniqueness;
 } __attribute__ ((__packed__));
 struct offset_v2 {
        __le64 v;
 } __attribute__ ((__packed__));
-static inline __u16 offset_v2_k_type( const struct offset_v2 *v2 )
+static inline __u16 offset_v2_k_type(const struct offset_v2 *v2)
 {
        __u8 type = le64_to_cpu(v2->v) >> 60;
-        return (type <= TYPE_MAXTYPE)?type:TYPE_ANY;
+        return (type <= TYPE_MAXTYPE) ? type : TYPE_ANY;
 }
- 
-static inline void set_offset_v2_k_type( struct offset_v2 *v2, int type )
+static inline void set_offset_v2_k_type(struct offset_v2 *v2, int type)
 {
-        v2->v = (v2->v & cpu_to_le64(~0ULL>>4)) | cpu_to_le64((__u64)type<<60);
+        v2->v =
+            (v2->v & cpu_to_le64(~0ULL >> 4)) | cpu_to_le64((__u64) type << 60);
 }
- 
-static inline loff_t offset_v2_k_offset( const struct offset_v2 *v2 )
+static inline loff_t offset_v2_k_offset(const struct offset_v2 *v2)
 {
-        return le64_to_cpu(v2->v) & (~0ULL>>4);
+        return le64_to_cpu(v2->v) & (~0ULL >> 4);
 }
-static inline void set_offset_v2_k_offset( struct offset_v2 *v2, loff_t offset ){
+static inline void set_offset_v2_k_offset(struct offset_v2 *v2, loff_t offset)
-        offset &= (~0ULL>>4);
+{
-        v2->v = (v2->v & cpu_to_le64(15ULL<<60)) | cpu_to_le64(offset);
+        offset &= (~0ULL >> 4);
+        v2->v = (v2->v & cpu_to_le64(15ULL << 60)) | cpu_to_le64(offset);
 }
 /* Key of an item determines its location in the S+tree, and
   is composed of 4 components */
 struct reiserfs_key {
-    __le32 k_dir_id;    /* packing locality: by default parent
+        __le32 k_dir_id;        /* packing locality: by default parent
-                          directory object id */
+                                   directory object id */
-    __le32 k_objectid;  /* object identifier */
+        __le32 k_objectid;      /* object identifier */
-    union {
+        union {
-        struct offset_v1 k_offset_v1;
+                struct offset_v1 k_offset_v1;
-        struct offset_v2 k_offset_v2;
+                struct offset_v2 k_offset_v2;
-    } __attribute__ ((__packed__)) u;
+        } __attribute__ ((__packed__)) u;
 } __attribute__ ((__packed__));
 struct in_core_key {
-    __u32 k_dir_id;    /* packing locality: by default parent
+        __u32 k_dir_id;         /* packing locality: by default parent
-                          directory object id */
+                                   directory object id */
-    __u32 k_objectid;  /* object identifier */
+        __u32 k_objectid;       /* object identifier */
-    __u64 k_offset;
+        __u64 k_offset;
-    __u8 k_type;
+        __u8 k_type;
 };
 struct cpu_key {
-    struct in_core_key on_disk_key;
+        struct in_core_key on_disk_key;
-    int version;
+        int version;
-    int key_length; /* 3 in all cases but direct2indirect and
+        int key_length;         /* 3 in all cases but direct2indirect and
-                       indirect2direct conversion */
+                                   indirect2direct conversion */
 };
 /* Our function for comparing keys can compare keys of different
@@ -475,8 +466,7 @@ struct cpu_key {
    indirect items) and specifies the location of the item itself
    within the block.  */
-struct item_head
+struct item_head {
-{
        /* Everything in the tree is found by searching for it based on
         * its key.*/
        struct reiserfs_key ih_key;
@@ -492,13 +482,13 @@ struct item_head
                   number of directory entries in the directory item. */
                __le16 ih_entry_count;
        } __attribute__ ((__packed__)) u;
-        __le16 ih_item_len;           /* total size of the item body */
+        __le16 ih_item_len;     /* total size of the item body */
-        __le16 ih_item_location;      /* an offset to the item body
+        __le16 ih_item_location;        /* an offset to the item body
-                                      * within the block */
+                                         * within the block */
-        __le16 ih_version;           /* 0 for all old items, 2 for new
+        __le16 ih_version;      /* 0 for all old items, 2 for new
-                                        ones. Highest bit is set by fsck
+                                   ones. Highest bit is set by fsck
-                                        temporary, cleaned after all
+                                   temporary, cleaned after all
-                                        done */
+                                   done */
 } __attribute__ ((__packed__));
 /* size of item header     */
 #define IH_SIZE (sizeof(struct item_head))
@@ -515,7 +505,6 @@ struct item_head
 #define put_ih_location(ih, val)     do { (ih)->ih_item_location = cpu_to_le16(val); } while (0)
 #define put_ih_item_len(ih, val)     do { (ih)->ih_item_len = cpu_to_le16(val); } while (0)
 #define unreachable_item(ih) (ih_version(ih) & (1 << 15))
 #define get_ih_free_space(ih) (ih_version (ih) == KEY_FORMAT_3_6 ? 0 : ih_free_space (ih))
@@ -537,40 +526,48 @@ struct item_head
 #define V1_INDIRECT_UNIQUENESS 0xfffffffe
 #define V1_DIRECT_UNIQUENESS 0xffffffff
 #define V1_DIRENTRY_UNIQUENESS 500
-#define V1_ANY_UNIQUENESS 555 // FIXME: comment is required
+#define V1_ANY_UNIQUENESS 555   // FIXME: comment is required
 //
 // here are conversion routines
 //
-static inline int uniqueness2type (__u32 uniqueness) CONSTF;
+static inline int uniqueness2type(__u32 uniqueness) CONSTF;
-static inline int uniqueness2type (__u32 uniqueness)
+static inline int uniqueness2type(__u32 uniqueness)
 {
-    switch ((int)uniqueness) {
+        switch ((int)uniqueness) {
-    case V1_SD_UNIQUENESS: return TYPE_STAT_DATA;
+        case V1_SD_UNIQUENESS:
-    case V1_INDIRECT_UNIQUENESS: return TYPE_INDIRECT;
+                return TYPE_STAT_DATA;
-    case V1_DIRECT_UNIQUENESS: return TYPE_DIRECT;
+        case V1_INDIRECT_UNIQUENESS:
-    case V1_DIRENTRY_UNIQUENESS: return TYPE_DIRENTRY;
+                return TYPE_INDIRECT;
-    default:
+        case V1_DIRECT_UNIQUENESS:
-            reiserfs_warning (NULL, "vs-500: unknown uniqueness %d",
+                return TYPE_DIRECT;
-                              uniqueness);
+        case V1_DIRENTRY_UNIQUENESS:
+                return TYPE_DIRENTRY;
+        default:
+                reiserfs_warning(NULL, "vs-500: unknown uniqueness %d",
+                                 uniqueness);
        case V1_ANY_UNIQUENESS:
-            return TYPE_ANY;
+                return TYPE_ANY;
-    }
+        }
 }
-static inline __u32 type2uniqueness (int type) CONSTF;
+static inline __u32 type2uniqueness(int type) CONSTF;
-static inline __u32 type2uniqueness (int type)
+static inline __u32 type2uniqueness(int type)
 {
-    switch (type) {
+        switch (type) {
-    case TYPE_STAT_DATA: return V1_SD_UNIQUENESS;
+        case TYPE_STAT_DATA:
-    case TYPE_INDIRECT: return V1_INDIRECT_UNIQUENESS;
+                return V1_SD_UNIQUENESS;
-    case TYPE_DIRECT: return V1_DIRECT_UNIQUENESS;
+        case TYPE_INDIRECT:
-    case TYPE_DIRENTRY: return V1_DIRENTRY_UNIQUENESS;
+                return V1_INDIRECT_UNIQUENESS;
-    default:
+        case TYPE_DIRECT:
-            reiserfs_warning (NULL, "vs-501: unknown type %d", type);
+                return V1_DIRECT_UNIQUENESS;
+        case TYPE_DIRENTRY:
+                return V1_DIRENTRY_UNIQUENESS;
+        default:
+                reiserfs_warning(NULL, "vs-501: unknown type %d", type);
        case TYPE_ANY:
-            return V1_ANY_UNIQUENESS;
+                return V1_ANY_UNIQUENESS;
-    }
+        }
 }
 //
@@ -578,57 +575,56 @@ static inline __u32 type2uniqueness (int type)
 // there is no way to get version of object from key, so, provide
 // version to these defines
 //
-static inline loff_t le_key_k_offset (int version, const struct reiserfs_key * key)
+static inline loff_t le_key_k_offset(int version,
+                                     const struct reiserfs_key *key)
 {
-    return (version == KEY_FORMAT_3_5) ?
+        return (version == KEY_FORMAT_3_5) ?
-        le32_to_cpu( key->u.k_offset_v1.k_offset ) :
+            le32_to_cpu(key->u.k_offset_v1.k_offset) :
-        offset_v2_k_offset( &(key->u.k_offset_v2) );
+            offset_v2_k_offset(&(key->u.k_offset_v2));
 }
-static inline loff_t le_ih_k_offset (const struct item_head * ih)
+static inline loff_t le_ih_k_offset(const struct item_head *ih)
 {
-    return le_key_k_offset (ih_version (ih), &(ih->ih_key));
+        return le_key_k_offset(ih_version(ih), &(ih->ih_key));
 }
-static inline loff_t le_key_k_type (int version, const struct reiserfs_key * key)
+static inline loff_t le_key_k_type(int version, const struct reiserfs_key *key)
 {
-    return (version == KEY_FORMAT_3_5) ?
+        return (version == KEY_FORMAT_3_5) ?
-        uniqueness2type( le32_to_cpu( key->u.k_offset_v1.k_uniqueness)) :
+            uniqueness2type(le32_to_cpu(key->u.k_offset_v1.k_uniqueness)) :
-        offset_v2_k_type( &(key->u.k_offset_v2) );
+            offset_v2_k_type(&(key->u.k_offset_v2));
 }
-static inline loff_t le_ih_k_type (const struct item_head * ih)
+static inline loff_t le_ih_k_type(const struct item_head *ih)
 {
-    return le_key_k_type (ih_version (ih), &(ih->ih_key));
+        return le_key_k_type(ih_version(ih), &(ih->ih_key));
 }
+static inline void set_le_key_k_offset(int version, struct reiserfs_key *key,
-static inline void set_le_key_k_offset (int version, struct reiserfs_key * key, loff_t offset)
+                                       loff_t offset)
 {
-    (version == KEY_FORMAT_3_5) ?
+        (version == KEY_FORMAT_3_5) ? (void)(key->u.k_offset_v1.k_offset = cpu_to_le32(offset)) :       /* jdm check */
-        (void)(key->u.k_offset_v1.k_offset = cpu_to_le32 (offset)) : /* jdm check */
+            (void)(set_offset_v2_k_offset(&(key->u.k_offset_v2), offset));
-        (void)(set_offset_v2_k_offset( &(key->u.k_offset_v2), offset ));
 }
+static inline void set_le_ih_k_offset(struct item_head *ih, loff_t offset)
-static inline void set_le_ih_k_offset (struct item_head * ih, loff_t offset)
 {
-    set_le_key_k_offset (ih_version (ih), &(ih->ih_key), offset);
+        set_le_key_k_offset(ih_version(ih), &(ih->ih_key), offset);
 }
+static inline void set_le_key_k_type(int version, struct reiserfs_key *key,
-static inline void set_le_key_k_type (int version, struct reiserfs_key * key, int type)
+                                     int type)
 {
-    (version == KEY_FORMAT_3_5) ?
+        (version == KEY_FORMAT_3_5) ?
-        (void)(key->u.k_offset_v1.k_uniqueness = cpu_to_le32(type2uniqueness(type))):
+            (void)(key->u.k_offset_v1.k_uniqueness =
-        (void)(set_offset_v2_k_type( &(key->u.k_offset_v2), type ));
+                   cpu_to_le32(type2uniqueness(type)))
+            : (void)(set_offset_v2_k_type(&(key->u.k_offset_v2), type));
 }
-static inline void set_le_ih_k_type (struct item_head * ih, int type)
+static inline void set_le_ih_k_type(struct item_head *ih, int type)
 {
-    set_le_key_k_type (ih_version (ih), &(ih->ih_key), type);
+        set_le_key_k_type(ih_version(ih), &(ih->ih_key), type);
 }
 #define is_direntry_le_key(version,key) (le_key_k_type (version, key) == TYPE_DIRENTRY)
 #define is_direct_le_key(version,key) (le_key_k_type (version, key) == TYPE_DIRECT)
 #define is_indirect_le_key(version,key) (le_key_k_type (version, key) == TYPE_INDIRECT)
@@ -642,34 +638,32 @@ static inline void set_le_ih_k_type (struct item_head * ih, int type)
 #define is_indirect_le_ih(ih) is_indirect_le_key (ih_version(ih), &((ih)->ih_key))
 #define is_statdata_le_ih(ih) is_statdata_le_key (ih_version (ih), &((ih)->ih_key))
 //
 // key is pointer to cpu key, result is cpu
 //
-static inline loff_t cpu_key_k_offset (const struct cpu_key * key)
+static inline loff_t cpu_key_k_offset(const struct cpu_key *key)
 {
-    return key->on_disk_key.k_offset;
+        return key->on_disk_key.k_offset;
 }
-static inline loff_t cpu_key_k_type (const struct cpu_key * key)
+static inline loff_t cpu_key_k_type(const struct cpu_key *key)
 {
-    return key->on_disk_key.k_type;
+        return key->on_disk_key.k_type;
 }
-static inline void set_cpu_key_k_offset (struct cpu_key * key, loff_t offset)
+static inline void set_cpu_key_k_offset(struct cpu_key *key, loff_t offset)
 {
        key->on_disk_key.k_offset = offset;
 }
-static inline void set_cpu_key_k_type (struct cpu_key * key, int type)
+static inline void set_cpu_key_k_type(struct cpu_key *key, int type)
 {
        key->on_disk_key.k_type = type;
 }
-static inline void cpu_key_k_offset_dec (struct cpu_key * key)
+static inline void cpu_key_k_offset_dec(struct cpu_key *key)
 {
-        key->on_disk_key.k_offset --;
+        key->on_disk_key.k_offset--;
 }
 #define is_direntry_cpu_key(key) (cpu_key_k_type (key) == TYPE_DIRENTRY)
@@ -677,34 +671,25 @@ static inline void cpu_key_k_offset_dec (struct cpu_key * key)
 #define is_indirect_cpu_key(key) (cpu_key_k_type (key) == TYPE_INDIRECT)
 #define is_statdata_cpu_key(key) (cpu_key_k_type (key) == TYPE_STAT_DATA)
 /* are these used ? */
 #define is_direntry_cpu_ih(ih) (is_direntry_cpu_key (&((ih)->ih_key)))
 #define is_direct_cpu_ih(ih) (is_direct_cpu_key (&((ih)->ih_key)))
 #define is_indirect_cpu_ih(ih) (is_indirect_cpu_key (&((ih)->ih_key)))
 #define is_statdata_cpu_ih(ih) (is_statdata_cpu_key (&((ih)->ih_key)))
 #define I_K_KEY_IN_ITEM(p_s_ih, p_s_key, n_blocksize) \
    ( ! COMP_SHORT_KEYS(p_s_ih, p_s_key) && \
          I_OFF_BYTE_IN_ITEM(p_s_ih, k_offset (p_s_key), n_blocksize) )
-/* maximal length of item */ 
+/* maximal length of item */
 #define MAX_ITEM_LEN(block_size) (block_size - BLKH_SIZE - IH_SIZE)
 #define MIN_ITEM_LEN 1
 /* object identifier for root dir */
 #define REISERFS_ROOT_OBJECTID 2
 #define REISERFS_ROOT_PARENT_OBJECTID 1
 extern struct reiserfs_key root_key;
 /* 
 * Picture represents a leaf of the S+tree
 *  ______________________________________________________
@@ -716,13 +701,13 @@ extern struct reiserfs_key root_key;
 /* Header of a disk block.  More precisely, header of a formatted leaf
   or internal node, and not the header of an unformatted node. */
-struct block_head {       
+struct block_head {
-  __le16 blk_level;        /* Level of a block in the tree. */
+        __le16 blk_level;       /* Level of a block in the tree. */
-  __le16 blk_nr_item;      /* Number of keys/items in a block. */
+        __le16 blk_nr_item;     /* Number of keys/items in a block. */
-  __le16 blk_free_space;   /* Block free space in bytes. */
+        __le16 blk_free_space;  /* Block free space in bytes. */
-  __le16 blk_reserved;
+        __le16 blk_reserved;
-                                /* dump this in v4/planA */
+        /* dump this in v4/planA */
-  struct reiserfs_key  blk_right_delim_key; /* kept only for compatibility */
+        struct reiserfs_key blk_right_delim_key;        /* kept only for compatibility */
 };
 #define BLKH_SIZE                     (sizeof(struct block_head))
@@ -741,12 +726,12 @@ struct block_head {
 * values for blk_level field of the struct block_head
 */
-#define FREE_LEVEL 0 /* when node gets removed from the tree its
+#define FREE_LEVEL 0            /* when node gets removed from the tree its
-                        blk_level is set to FREE_LEVEL. It is then
+                                   blk_level is set to FREE_LEVEL. It is then
-                        used to see whether the node is still in the
+                                   used to see whether the node is still in the
-                        tree */
+                                   tree */
-#define DISK_LEAF_NODE_LEVEL  1 /* Leaf node level.*/
+#define DISK_LEAF_NODE_LEVEL  1 /* Leaf node level. */
 /* Given the buffer head of a formatted node, resolve to the block head of that node. */
 #define B_BLK_HEAD(p_s_bh)            ((struct block_head *)((p_s_bh)->b_data))
@@ -759,7 +744,6 @@ struct block_head {
 #define PUT_B_LEVEL(p_s_bh,val)       do { set_blkh_level(B_BLK_HEAD(p_s_bh),val); } while (0)
 #define PUT_B_FREE_SPACE(p_s_bh,val)  do { set_blkh_free_space(B_BLK_HEAD(p_s_bh),val); } while (0)
 /* Get right delimiting key. -- little endian */
 #define B_PRIGHT_DELIM_KEY(p_s_bh)   (&(blk_right_delim_key(B_BLK_HEAD(p_s_bh))
@@ -770,41 +754,36 @@ struct block_head {
 #define B_IS_KEYS_LEVEL(p_s_bh)      (B_LEVEL(p_s_bh) > DISK_LEAF_NODE_LEVEL \
                                            && B_LEVEL(p_s_bh) <= MAX_HEIGHT)
 /***************************************************************************/
 /*                             STAT DATA                                   */
 /***************************************************************************/
 //
 // old stat data is 32 bytes long. We are going to distinguish new one by
 // different size
 //
-struct stat_data_v1
+struct stat_data_v1 {
-{
+        __le16 sd_mode;         /* file type, permissions */
-    __le16 sd_mode;     /* file type, permissions */
+        __le16 sd_nlink;        /* number of hard links */
-    __le16 sd_nlink;    /* number of hard links */
+        __le16 sd_uid;          /* owner */
-    __le16 sd_uid;              /* owner */
+        __le16 sd_gid;          /* group */
-    __le16 sd_gid;              /* group */
+        __le32 sd_size;         /* file size */
-    __le32 sd_size;     /* file size */
+        __le32 sd_atime;        /* time of last access */
-    __le32 sd_atime;    /* time of last access */
+        __le32 sd_mtime;        /* time file was last modified  */
-    __le32 sd_mtime;    /* time file was last modified  */
+        __le32 sd_ctime;        /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */
-    __le32 sd_ctime;    /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */
+        union {
-    union {
+                __le32 sd_rdev;
-        __le32 sd_rdev;
+                __le32 sd_blocks;       /* number of blocks file uses */
-        __le32 sd_blocks;       /* number of blocks file uses */
+        } __attribute__ ((__packed__)) u;
-    } __attribute__ ((__packed__)) u;
+        __le32 sd_first_direct_byte;    /* first byte of file which is stored
-    __le32 sd_first_direct_byte; /* first byte of file which is stored
+                                           in a direct item: except that if it
-                                   in a direct item: except that if it
+                                           equals 1 it is a symlink and if it
-                                   equals 1 it is a symlink and if it
+                                           equals ~(__u32)0 there is no
-                                   equals ~(__u32)0 there is no
+                                           direct item.  The existence of this
-                                   direct item.  The existence of this
+                                           field really grates on me. Let's
-                                   field really grates on me. Let's
+                                           replace it with a macro based on
-                                   replace it with a macro based on
+                                           sd_size and our tail suppression
-                                   sd_size and our tail suppression
+                                           policy.  Someday.  -Hans */
-                                   policy.  Someday.  -Hans */
 } __attribute__ ((__packed__));
 #define SD_V1_SIZE              (sizeof(struct stat_data_v1))
@@ -862,29 +841,29 @@ struct stat_data_v1
 /* Stat Data on disk (reiserfs version of UFS disk inode minus the
   address blocks) */
 struct stat_data {
-    __le16 sd_mode;     /* file type, permissions */
+        __le16 sd_mode;         /* file type, permissions */
-    __le16 sd_attrs;     /* persistent inode flags */
+        __le16 sd_attrs;        /* persistent inode flags */
-    __le32 sd_nlink;    /* number of hard links */
+        __le32 sd_nlink;        /* number of hard links */
-    __le64 sd_size;     /* file size */
+        __le64 sd_size;         /* file size */
-    __le32 sd_uid;              /* owner */
+        __le32 sd_uid;          /* owner */
-    __le32 sd_gid;              /* group */
+        __le32 sd_gid;          /* group */
-    __le32 sd_atime;    /* time of last access */
+        __le32 sd_atime;        /* time of last access */
-    __le32 sd_mtime;    /* time file was last modified  */
+        __le32 sd_mtime;        /* time file was last modified  */
-    __le32 sd_ctime;    /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */
+        __le32 sd_ctime;        /* time inode (stat data) was last changed (except changes to sd_atime and sd_mtime) */
-    __le32 sd_blocks;
+        __le32 sd_blocks;
-    union {
+        union {
-        __le32 sd_rdev;
+                __le32 sd_rdev;
-        __le32 sd_generation;
+                __le32 sd_generation;
-      //__le32 sd_first_direct_byte;
+                //__le32 sd_first_direct_byte;
-      /* first byte of file which is stored in a
+                /* first byte of file which is stored in a
-                                       direct item: except that if it equals 1
+                   direct item: except that if it equals 1
-                                       it is a symlink and if it equals
+                   it is a symlink and if it equals
-                                       ~(__u32)0 there is no direct item.  The
+                   ~(__u32)0 there is no direct item.  The
-                                       existence of this field really grates
+                   existence of this field really grates
-                                       on me. Let's replace it with a macro
+                   on me. Let's replace it with a macro
-                                       based on sd_size and our tail
+                   based on sd_size and our tail
-                                       suppression policy? */
+                   suppression policy? */
-  } __attribute__ ((__packed__)) u;
+        } __attribute__ ((__packed__)) u;
 } __attribute__ ((__packed__));
 //
 // this is 44 bytes long
@@ -919,7 +898,6 @@ struct stat_data {
 #define sd_v2_attrs(sdp)         (le16_to_cpu((sdp)->sd_attrs))
 #define set_sd_v2_attrs(sdp,v)   ((sdp)->sd_attrs = cpu_to_le16(v))
 /***************************************************************************/
 /*                      DIRECTORY STRUCTURE                                */
 /***************************************************************************/
@@ -954,17 +932,14 @@ struct stat_data {
 /* NOT IMPLEMENTED:   
   Directory will someday contain stat data of object */
+struct reiserfs_de_head {
+        __le32 deh_offset;      /* third component of the directory entry key */
-struct reiserfs_de_head
+        __le32 deh_dir_id;      /* objectid of the parent directory of the object, that is referenced
-{
+                                   by directory entry */
-  __le32 deh_offset;            /* third component of the directory entry key */
+        __le32 deh_objectid;    /* objectid of the object, that is referenced by directory entry */
-  __le32 deh_dir_id;            /* objectid of the parent directory of the object, that is referenced
+        __le16 deh_location;    /* offset of name in the whole item */
-                                           by directory entry */
+        __le16 deh_state;       /* whether 1) entry contains stat data (for future), and 2) whether
-  __le32 deh_objectid;          /* objectid of the object, that is referenced by directory entry */
+                                   entry is hidden (unlinked) */
-  __le16 deh_location;          /* offset of name in the whole item */
-  __le16 deh_state;             /* whether 1) entry contains stat data (for future), and 2) whether
-                                           entry is hidden (unlinked) */
 } __attribute__ ((__packed__));
 #define DEH_SIZE                  sizeof(struct reiserfs_de_head)
 #define deh_offset(p_deh)         (le32_to_cpu((p_deh)->deh_offset))
@@ -986,7 +961,7 @@ struct reiserfs_de_head
 /* old format directories have this size when empty */
 #define EMPTY_DIR_SIZE_V1 (DEH_SIZE * 2 + 3)
-#define DEH_Statdata 0                  /* not used now */
+#define DEH_Statdata 0          /* not used now */
 #define DEH_Visible 2
 /* 64 bit systems (and the S/390) need to be aligned explicitly -jdm */
@@ -1023,10 +998,10 @@ struct reiserfs_de_head
 #define de_visible(deh)             test_bit_unaligned (DEH_Visible, &((deh)->deh_state))
 #define de_hidden(deh)              !test_bit_unaligned (DEH_Visible, &((deh)->deh_state))
-extern void make_empty_dir_item_v1 (char * body, __le32 dirid, __le32 objid,
+extern void make_empty_dir_item_v1(char *body, __le32 dirid, __le32 objid,
-                                    __le32 par_dirid, __le32 par_objid);
+                                   __le32 par_dirid, __le32 par_objid);
-extern void make_empty_dir_item (char * body, __le32 dirid, __le32 objid,
+extern void make_empty_dir_item(char *body, __le32 dirid, __le32 objid,
-                                 __le32 par_dirid, __le32 par_objid);
+                                __le32 par_dirid, __le32 par_objid);
 /* array of the entry headers */
 /* get item body */
@@ -1043,53 +1018,48 @@ extern void make_empty_dir_item (char * body, __le32 dirid, __le32 objid,
 #define I_DEH_N_ENTRY_LENGTH(ih,deh,i) \
 ((i) ? (deh_location((deh)-1) - deh_location((deh))) : (ih_item_len((ih)) - deh_location((deh))))
 */
-static inline int entry_length (const struct buffer_head * bh, 
+static inline int entry_length(const struct buffer_head *bh,
-                                                                const struct item_head * ih, int pos_in_item)
+                               const struct item_head *ih, int pos_in_item)
 {
-    struct reiserfs_de_head * deh;
+        struct reiserfs_de_head *deh;
-    deh = B_I_DEH (bh, ih) + pos_in_item;
+        deh = B_I_DEH(bh, ih) + pos_in_item;
-    if (pos_in_item)
+        if (pos_in_item)
-        return deh_location(deh-1) - deh_location(deh);
+                return deh_location(deh - 1) - deh_location(deh);
-    return ih_item_len(ih) - deh_location(deh);
+        return ih_item_len(ih) - deh_location(deh);
 }
 /* number of entries in the directory item, depends on ENTRY_COUNT being at the start of directory dynamic data. */
 #define I_ENTRY_COUNT(ih) (ih_entry_count((ih)))
 /* name by bh, ih and entry_num */
 #define B_I_E_NAME(bh,ih,entry_num) ((char *)(bh->b_data + ih_location(ih) + deh_location(B_I_DEH(bh,ih)+(entry_num))))
 // two entries per block (at least)
 #define REISERFS_MAX_NAME(block_size) 255
 /* this structure is used for operations on directory entries. It is
   not a disk structure. */
 /* When reiserfs_find_entry or search_by_entry_key find directory
   entry, they return filled reiserfs_dir_entry structure */
-struct reiserfs_dir_entry
+struct reiserfs_dir_entry {
-{
+        struct buffer_head *de_bh;
-  struct buffer_head * de_bh;
+        int de_item_num;
-  int de_item_num;
+        struct item_head *de_ih;
-  struct item_head * de_ih;
+        int de_entry_num;
-  int de_entry_num;
+        struct reiserfs_de_head *de_deh;
-  struct reiserfs_de_head * de_deh;
+        int de_entrylen;
-  int de_entrylen;
+        int de_namelen;
-  int de_namelen;
+        char *de_name;
-  char * de_name;
+        char *de_gen_number_bit_string;
-  char * de_gen_number_bit_string;
+        __u32 de_dir_id;
-  __u32 de_dir_id;
+        __u32 de_objectid;
-  __u32 de_objectid;
+        struct cpu_key de_entry_key;
-  struct cpu_key de_entry_key;
 };
-   
 /* these defines are useful when a particular member of a reiserfs_dir_entry is needed */
 /* pointer to file name, stored in entry */
@@ -1099,8 +1069,6 @@ struct reiserfs_dir_entry
 #define I_DEH_N_ENTRY_FILE_NAME_LENGTH(ih,deh,entry_num) \
 (I_DEH_N_ENTRY_LENGTH (ih, deh, entry_num) - (de_with_sd (deh) ? SD_SIZE : 0))
 /* hash value occupies bits from 7 up to 30 */
 #define GET_HASH_VALUE(offset) ((offset) & 0x7fffff80LL)
 /* generation number occupies 7 bits starting from 0 up to 6 */
@@ -1109,7 +1077,6 @@ struct reiserfs_dir_entry
 #define SET_GENERATION_NUMBER(offset,gen_number) (GET_HASH_VALUE(offset)|(gen_number))
 /*
 * Picture represents an internal node of the reiserfs tree
 *  ______________________________________________________
@@ -1125,9 +1092,9 @@ struct reiserfs_dir_entry
 /* Disk child pointer: The pointer from an internal node of the tree
   to a node that is on disk. */
 struct disk_child {
-  __le32       dc_block_number;              /* Disk child's block number. */
+        __le32 dc_block_number; /* Disk child's block number. */
-  __le16       dc_size;                     /* Disk child's used space.   */
+        __le16 dc_size;         /* Disk child's used space.   */
-  __le16       dc_reserved;
+        __le16 dc_reserved;
 };
 #define DC_SIZE (sizeof(struct disk_child))
@@ -1144,7 +1111,7 @@ struct disk_child {
 #define B_N_CHILD_NUM(p_s_bh,n_pos) (dc_block_number(B_N_CHILD(p_s_bh,n_pos)))
 #define PUT_B_N_CHILD_NUM(p_s_bh,n_pos, val) (put_dc_block_number(B_N_CHILD(p_s_bh,n_pos), val ))
- /* maximal value of field child_size in structure disk_child */ 
+ /* maximal value of field child_size in structure disk_child */
 /* child size is the combined size of all items and their headers */
 #define MAX_CHILD_SIZE(bh) ((int)( (bh)->b_size - BLKH_SIZE ))
@@ -1159,7 +1126,6 @@ struct disk_child {
 /*                      PATH STRUCTURES AND DEFINES                        */
 /***************************************************************************/
 /* Search_by_key fills up the path from the root to the leaf as it descends the tree looking for the
   key.  It uses reiserfs_bread to try to find buffers in the cache given their block number.  If it
   does not find them in the cache it reads them from disk.  For each node search_by_key finds using
@@ -1168,20 +1134,18 @@ struct disk_child {
   is looking through a leaf node bin_search will find the position of the item which has key either
   equal to given key, or which is the maximal key less than the given key. */
-struct  path_element  {
+struct path_element {
-  struct buffer_head *  pe_buffer;    /* Pointer to the buffer at the path in the tree. */
+        struct buffer_head *pe_buffer;  /* Pointer to the buffer at the path in the tree. */
-  int                   pe_position;  /* Position in the tree node which is placed in the */
+        int pe_position;        /* Position in the tree node which is placed in the */
-                                      /* buffer above.                                  */
+        /* buffer above.                                  */
 };
-#define MAX_HEIGHT 5 /* maximal height of a tree. don't change this without changing JOURNAL_PER_BALANCE_CNT */
+#define MAX_HEIGHT 5            /* maximal height of a tree. don't change this without changing JOURNAL_PER_BALANCE_CNT */
-#define EXTENDED_MAX_HEIGHT         7 /* Must be equals MAX_HEIGHT + FIRST_PATH_ELEMENT_OFFSET */
+#define EXTENDED_MAX_HEIGHT         7   /* Must be equals MAX_HEIGHT + FIRST_PATH_ELEMENT_OFFSET */
-#define FIRST_PATH_ELEMENT_OFFSET   2 /* Must be equal to at least 2. */
+#define FIRST_PATH_ELEMENT_OFFSET   2   /* Must be equal to at least 2. */
-#define ILLEGAL_PATH_ELEMENT_OFFSET 1 /* Must be equal to FIRST_PATH_ELEMENT_OFFSET - 1 */
-#define MAX_FEB_SIZE 6   /* this MUST be MAX_HEIGHT + 1. See about FEB below */
+#define ILLEGAL_PATH_ELEMENT_OFFSET 1   /* Must be equal to FIRST_PATH_ELEMENT_OFFSET - 1 */
+#define MAX_FEB_SIZE 6          /* this MUST be MAX_HEIGHT + 1. See about FEB below */
 /* We need to keep track of who the ancestors of nodes are.  When we
   perform a search we record which nodes were visited while
@@ -1200,14 +1164,14 @@ excessive effort to avoid disturbing the precious VFS code.:-( The
 gods only know how we are going to SMP the code that uses them.
 znodes are the way! */
-#define PATH_READA      0x1 /* do read ahead */
+#define PATH_READA      0x1     /* do read ahead */
-#define PATH_READA_BACK 0x2 /* read backwards */
+#define PATH_READA_BACK 0x2     /* read backwards */
-struct  path {
+struct path {
-  int                   path_length;                            /* Length of the array above.   */
+        int path_length;        /* Length of the array above.   */
-  int                   reada;
+        int reada;
-  struct  path_element  path_elements[EXTENDED_MAX_HEIGHT];     /* Array of the path elements.  */
+        struct path_element path_elements[EXTENDED_MAX_HEIGHT]; /* Array of the path elements.  */
-  int                   pos_in_item;
+        int pos_in_item;
 };
 #define pos_in_item(path) ((path)->pos_in_item)
@@ -1224,25 +1188,23 @@ struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 /* Get position in the element at the path by path and path position. */
 #define PATH_OFFSET_POSITION(p_s_path,n_offset) (PATH_OFFSET_PELEMENT(p_s_path,n_offset)->pe_position)
 #define PATH_PLAST_BUFFER(p_s_path) (PATH_OFFSET_PBUFFER((p_s_path), (p_s_path)->path_length))
                                /* you know, to the person who didn't
-                                   write this the macro name does not
+                                   write this the macro name does not
-                                   at first suggest what it does.
+                                   at first suggest what it does.
-                                   Maybe POSITION_FROM_PATH_END? Or
+                                   Maybe POSITION_FROM_PATH_END? Or
-                                   maybe we should just focus on
+                                   maybe we should just focus on
-                                   dumping paths... -Hans */
+                                   dumping paths... -Hans */
 #define PATH_LAST_POSITION(p_s_path) (PATH_OFFSET_POSITION((p_s_path), (p_s_path)->path_length))
 #define PATH_PITEM_HEAD(p_s_path)    B_N_PITEM_HEAD(PATH_PLAST_BUFFER(p_s_path),PATH_LAST_POSITION(p_s_path))
 /* in do_balance leaf has h == 0 in contrast with path structure,
   where root has level == 0. That is why we need these defines */
 #define PATH_H_PBUFFER(p_s_path, h) PATH_OFFSET_PBUFFER (p_s_path, p_s_path->path_length - (h)) /* tb->S[h] */
-#define PATH_H_PPARENT(path, h) PATH_H_PBUFFER (path, (h) + 1)                  /* tb->F[h] or tb->S[0]->b_parent */
+#define PATH_H_PPARENT(path, h) PATH_H_PBUFFER (path, (h) + 1)  /* tb->F[h] or tb->S[0]->b_parent */
-#define PATH_H_POSITION(path, h) PATH_OFFSET_POSITION (path, path->path_length - (h))   
+#define PATH_H_POSITION(path, h) PATH_OFFSET_POSITION (path, path->path_length - (h))
-#define PATH_H_B_ITEM_ORDER(path, h) PATH_H_POSITION(path, h + 1)               /* tb->S[h]->b_item_order */
+#define PATH_H_B_ITEM_ORDER(path, h) PATH_H_POSITION(path, h + 1)       /* tb->S[h]->b_item_order */
 #define PATH_H_PATH_OFFSET(p_s_path, n_h) ((p_s_path)->path_length - (n_h))
@@ -1253,7 +1215,6 @@ struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 #define item_moved(ih,path) comp_items(ih, path)
 #define path_changed(ih,path) comp_items (ih, path)
 /***************************************************************************/
 /*                       MISC                                              */
 /***************************************************************************/
@@ -1272,30 +1233,26 @@ struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 // reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset
 #define U32_MAX (~(__u32)0)
-static inline loff_t max_reiserfs_offset (struct inode * inode)
+static inline loff_t max_reiserfs_offset(struct inode *inode)
 {
-    if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5)
+        if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5)
-        return (loff_t)U32_MAX;
+                return (loff_t) U32_MAX;
-    return (loff_t)((~(__u64)0) >> 4);
+        return (loff_t) ((~(__u64) 0) >> 4);
 }
 /*#define MAX_KEY_UNIQUENESS    MAX_UL_INT*/
 #define MAX_KEY_OBJECTID        MAX_UL_INT
 #define MAX_B_NUM  MAX_UL_INT
 #define MAX_FC_NUM MAX_US_INT
 /* the purpose is to detect overflow of an unsigned short */
 #define REISERFS_LINK_MAX (MAX_US_INT - 1000)
 /* The following defines are used in reiserfs_insert_item and reiserfs_append_item  */
-#define REISERFS_KERNEL_MEM             0       /* reiserfs kernel memory mode  */
+#define REISERFS_KERNEL_MEM             0       /* reiserfs kernel memory mode  */
-#define REISERFS_USER_MEM               1       /* reiserfs user memory mode            */
+#define REISERFS_USER_MEM               1       /* reiserfs user memory mode            */
 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
 #define get_generation(s) atomic_read (&fs_generation(s))
@@ -1303,7 +1260,6 @@ static inline loff_t max_reiserfs_offset (struct inode * inode)
 #define __fs_changed(gen,s) (gen != get_generation (s))
 #define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);})
 /***************************************************************************/
 /*                  FIXATE NODES                                           */
 /***************************************************************************/
@@ -1324,38 +1280,34 @@ static inline loff_t max_reiserfs_offset (struct inode * inode)
   calculating what we can shift to neighbors and how many nodes we
   have to have if we do not any shiftings, if we shift to left/right
   neighbor or to both. */
-struct virtual_item
+struct virtual_item {
-{
+        int vi_index;           // index in the array of item operations
-    int vi_index; // index in the array of item operations
+        unsigned short vi_type; // left/right mergeability
-    unsigned short vi_type;     // left/right mergeability
+        unsigned short vi_item_len;     /* length of item that it will have after balancing */
-    unsigned short vi_item_len;           /* length of item that it will have after balancing */
+        struct item_head *vi_ih;
-    struct item_head * vi_ih;
+        const char *vi_item;    // body of item (old or new)
-    const char * vi_item;     // body of item (old or new)
+        const void *vi_new_data;        // 0 always but paste mode
-    const void * vi_new_data; // 0 always but paste mode
+        void *vi_uarea;         // item specific area
-    void * vi_uarea;    // item specific area
 };
+struct virtual_node {
-struct virtual_node
+        char *vn_free_ptr;      /* this is a pointer to the free space in the buffer */
-{
+        unsigned short vn_nr_item;      /* number of items in virtual node */
-  char * vn_free_ptr;           /* this is a pointer to the free space in the buffer */
+        short vn_size;          /* size of node , that node would have if it has unlimited size and no balancing is performed */
-  unsigned short vn_nr_item;    /* number of items in virtual node */
+        short vn_mode;          /* mode of balancing (paste, insert, delete, cut) */
-  short vn_size;                /* size of node , that node would have if it has unlimited size and no balancing is performed */
+        short vn_affected_item_num;
-  short vn_mode;                /* mode of balancing (paste, insert, delete, cut) */
+        short vn_pos_in_item;
-  short vn_affected_item_num; 
+        struct item_head *vn_ins_ih;    /* item header of inserted item, 0 for other modes */
-  short vn_pos_in_item;
+        const void *vn_data;
-  struct item_head * vn_ins_ih; /* item header of inserted item, 0 for other modes */
+        struct virtual_item *vn_vi;     /* array of items (including a new one, excluding item to be deleted) */
-  const void * vn_data;
-  struct virtual_item * vn_vi;  /* array of items (including a new one, excluding item to be deleted) */
 };
 /* used by directory items when creating virtual nodes */
 struct direntry_uarea {
-    int flags;
+        int flags;
-    __u16 entry_count;
+        __u16 entry_count;
-    __u16 entry_sizes[1];
+        __u16 entry_sizes[1];
-} __attribute__ ((__packed__)) ;
+} __attribute__ ((__packed__));
 /***************************************************************************/
 /*                  TREE BALANCE                                           */
@@ -1378,73 +1330,72 @@ struct direntry_uarea {
 #define MAX_AMOUNT_NEEDED 2
 /* someday somebody will prefix every field in this struct with tb_ */
-struct tree_balance
+struct tree_balance {
-{
+        int tb_mode;
-  int tb_mode;
+        int need_balance_dirty;
-  int need_balance_dirty;
+        struct super_block *tb_sb;
-  struct super_block * tb_sb;
+        struct reiserfs_transaction_handle *transaction_handle;
-  struct reiserfs_transaction_handle *transaction_handle ;
+        struct path *tb_path;
-  struct path * tb_path;
+        struct buffer_head *L[MAX_HEIGHT];      /* array of left neighbors of nodes in the path */
-  struct buffer_head * L[MAX_HEIGHT];        /* array of left neighbors of nodes in the path */
+        struct buffer_head *R[MAX_HEIGHT];      /* array of right neighbors of nodes in the path */
-  struct buffer_head * R[MAX_HEIGHT];        /* array of right neighbors of nodes in the path*/
+        struct buffer_head *FL[MAX_HEIGHT];     /* array of fathers of the left  neighbors      */
-  struct buffer_head * FL[MAX_HEIGHT];       /* array of fathers of the left  neighbors      */
+        struct buffer_head *FR[MAX_HEIGHT];     /* array of fathers of the right neighbors      */
-  struct buffer_head * FR[MAX_HEIGHT];       /* array of fathers of the right neighbors      */
+        struct buffer_head *CFL[MAX_HEIGHT];    /* array of common parents of center node and its left neighbor  */
-  struct buffer_head * CFL[MAX_HEIGHT];      /* array of common parents of center node and its left neighbor  */
+        struct buffer_head *CFR[MAX_HEIGHT];    /* array of common parents of center node and its right neighbor */
-  struct buffer_head * CFR[MAX_HEIGHT];      /* array of common parents of center node and its right neighbor */
+        struct buffer_head *FEB[MAX_FEB_SIZE];  /* array of empty buffers. Number of buffers in array equals
-  struct buffer_head * FEB[MAX_FEB_SIZE]; /* array of empty buffers. Number of buffers in array equals
+                                                   cur_blknum. */
-                                             cur_blknum. */
+        struct buffer_head *used[MAX_FEB_SIZE];
-  struct buffer_head * used[MAX_FEB_SIZE];
+        struct buffer_head *thrown[MAX_FEB_SIZE];
-  struct buffer_head * thrown[MAX_FEB_SIZE];
+        int lnum[MAX_HEIGHT];   /* array of number of items which must be
-  int lnum[MAX_HEIGHT]; /* array of number of items which must be
+                                   shifted to the left in order to balance the
-                           shifted to the left in order to balance the
+                                   current node; for leaves includes item that
-                           current node; for leaves includes item that
+                                   will be partially shifted; for internal
-                           will be partially shifted; for internal
+                                   nodes, it is the number of child pointers
-                           nodes, it is the number of child pointers
+                                   rather than items. It includes the new item
-                           rather than items. It includes the new item
+                                   being created. The code sometimes subtracts
-                           being created. The code sometimes subtracts
+                                   one to get the number of wholly shifted
-                           one to get the number of wholly shifted
+                                   items for other purposes. */
-                           items for other purposes. */
+        int rnum[MAX_HEIGHT];   /* substitute right for left in comment above */
-  int rnum[MAX_HEIGHT]; /* substitute right for left in comment above */
+        int lkey[MAX_HEIGHT];   /* array indexed by height h mapping the key delimiting L[h] and
-  int lkey[MAX_HEIGHT];               /* array indexed by height h mapping the key delimiting L[h] and
+                                   S[h] to its item number within the node CFL[h] */
-                                               S[h] to its item number within the node CFL[h] */
+        int rkey[MAX_HEIGHT];   /* substitute r for l in comment above */
-  int rkey[MAX_HEIGHT];               /* substitute r for l in comment above */
+        int insert_size[MAX_HEIGHT];    /* the number of bytes by we are trying to add or remove from
-  int insert_size[MAX_HEIGHT];        /* the number of bytes by we are trying to add or remove from
+                                           S[h]. A negative value means removing.  */
-                                               S[h]. A negative value means removing.  */
+        int blknum[MAX_HEIGHT]; /* number of nodes that will replace node S[h] after
-  int blknum[MAX_HEIGHT];             /* number of nodes that will replace node S[h] after
+                                   balancing on the level h of the tree.  If 0 then S is
-                                               balancing on the level h of the tree.  If 0 then S is
+                                   being deleted, if 1 then S is remaining and no new nodes
-                                               being deleted, if 1 then S is remaining and no new nodes
+                                   are being created, if 2 or 3 then 1 or 2 new nodes is
-                                               are being created, if 2 or 3 then 1 or 2 new nodes is
+                                   being created */
-                                               being created */
+        /* fields that are used only for balancing leaves of the tree */
-  /* fields that are used only for balancing leaves of the tree */
+        int cur_blknum;         /* number of empty blocks having been already allocated                 */
-  int cur_blknum;       /* number of empty blocks having been already allocated                 */
+        int s0num;              /* number of items that fall into left most  node when S[0] splits     */
-  int s0num;             /* number of items that fall into left most  node when S[0] splits     */
+        int s1num;              /* number of items that fall into first  new node when S[0] splits     */
-  int s1num;             /* number of items that fall into first  new node when S[0] splits     */
+        int s2num;              /* number of items that fall into second new node when S[0] splits     */
-  int s2num;             /* number of items that fall into second new node when S[0] splits     */
+        int lbytes;             /* number of bytes which can flow to the left neighbor from the        left    */
-  int lbytes;            /* number of bytes which can flow to the left neighbor from the        left    */
+        /* most liquid item that cannot be shifted from S[0] entirely         */
-  /* most liquid item that cannot be shifted from S[0] entirely         */
+        /* if -1 then nothing will be partially shifted */
-  /* if -1 then nothing will be partially shifted */
+        int rbytes;             /* number of bytes which will flow to the right neighbor from the right        */
-  int rbytes;            /* number of bytes which will flow to the right neighbor from the right        */
+        /* most liquid item that cannot be shifted from S[0] entirely         */
-  /* most liquid item that cannot be shifted from S[0] entirely         */
+        /* if -1 then nothing will be partially shifted                           */
-  /* if -1 then nothing will be partially shifted                           */
+        int s1bytes;            /* number of bytes which flow to the first  new node when S[0] splits   */
-  int s1bytes;          /* number of bytes which flow to the first  new node when S[0] splits   */
+        /* note: if S[0] splits into 3 nodes, then items do not need to be cut  */
-                                /* note: if S[0] splits into 3 nodes, then items do not need to be cut  */
+        int s2bytes;
-  int s2bytes;
+        struct buffer_head *buf_to_free[MAX_FREE_BLOCK];        /* buffers which are to be freed after do_balance finishes by unfix_nodes */
-  struct buffer_head * buf_to_free[MAX_FREE_BLOCK]; /* buffers which are to be freed after do_balance finishes by unfix_nodes */
+        char *vn_buf;           /* kmalloced memory. Used to create
-  char * vn_buf;                /* kmalloced memory. Used to create
                                   virtual node and keep map of
                                   dirtied bitmap blocks */
-  int vn_buf_size;              /* size of the vn_buf */
+        int vn_buf_size;        /* size of the vn_buf */
-  struct virtual_node * tb_vn;  /* VN starts after bitmap of bitmap blocks */
+        struct virtual_node *tb_vn;     /* VN starts after bitmap of bitmap blocks */
-  int fs_gen;                  /* saved value of `reiserfs_generation' counter
+        int fs_gen;             /* saved value of `reiserfs_generation' counter
-                                  see FILESYSTEM_CHANGED() macro in reiserfs_fs.h */
+                                   see FILESYSTEM_CHANGED() macro in reiserfs_fs.h */
 #ifdef DISPLACE_NEW_PACKING_LOCALITIES
-  struct in_core_key  key;            /* key pointer, to pass to block allocator or
+        struct in_core_key key; /* key pointer, to pass to block allocator or
-                                 another low-level subsystem */
+                                   another low-level subsystem */
 #endif
-} ;
+};
 /* These are modes of balancing */
@@ -1479,13 +1430,12 @@ struct tree_balance
 /* used in do_balance for passing parent of node information that has
   been gotten from tb struct */
 struct buffer_info {
-    struct tree_balance * tb;
+        struct tree_balance *tb;
-    struct buffer_head * bi_bh;
+        struct buffer_head *bi_bh;
-    struct buffer_head * bi_parent;
+        struct buffer_head *bi_parent;
-    int bi_position;
+        int bi_position;
 };
 /* there are 4 types of items: stat data, directory item, indirect, direct.
 +-------------------+------------+--------------+------------+
 |                   |  k_offset  | k_uniqueness | mergeable? |
@@ -1503,24 +1453,24 @@ struct buffer_info {
 */
 struct item_operations {
-    int (*bytes_number) (struct item_head * ih, int block_size);
+        int (*bytes_number) (struct item_head * ih, int block_size);
-    void (*decrement_key) (struct cpu_key *);
+        void (*decrement_key) (struct cpu_key *);
-    int (*is_left_mergeable) (struct reiserfs_key * ih, unsigned long bsize);
+        int (*is_left_mergeable) (struct reiserfs_key * ih,
-    void (*print_item) (struct item_head *, char * item);
+                                  unsigned long bsize);
-    void (*check_item) (struct item_head *, char * item);
+        void (*print_item) (struct item_head *, char *item);
+        void (*check_item) (struct item_head *, char *item);
-    int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi, 
-                      int is_affected, int insert_size);
+        int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi,
-    int (*check_left) (struct virtual_item * vi, int free, 
+                          int is_affected, int insert_size);
-                            int start_skip, int end_skip);
+        int (*check_left) (struct virtual_item * vi, int free,
-    int (*check_right) (struct virtual_item * vi, int free);
+                           int start_skip, int end_skip);
-    int (*part_size) (struct virtual_item * vi, int from, int to);
+        int (*check_right) (struct virtual_item * vi, int free);
-    int (*unit_num) (struct virtual_item * vi);
+        int (*part_size) (struct virtual_item * vi, int from, int to);
-    void (*print_vi) (struct virtual_item * vi);
+        int (*unit_num) (struct virtual_item * vi);
+        void (*print_vi) (struct virtual_item * vi);
 };
+extern struct item_operations *item_ops[TYPE_ANY + 1];
-extern struct item_operations * item_ops [TYPE_ANY + 1];
 #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
 #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
@@ -1533,8 +1483,6 @@ extern struct item_operations * item_ops [TYPE_ANY + 1];
 #define op_unit_num(vi)                              item_ops[(vi)->vi_index]->unit_num (vi)
 #define op_print_vi(vi)                              item_ops[(vi)->vi_index]->print_vi (vi)
 #define COMP_SHORT_KEYS comp_short_keys
 /* number of blocks pointed to by the indirect item */
@@ -1545,8 +1493,7 @@ extern struct item_operations * item_ops [TYPE_ANY + 1];
 /* number of bytes contained by the direct item or the unformatted nodes the indirect item points to */
+/* get the item header */
-/* get the item header */ 
 #define B_N_PITEM_HEAD(bh,item_num) ( (struct item_head * )((bh)->b_data + BLKH_SIZE) + (item_num) )
 /* get key */
@@ -1577,9 +1524,9 @@ extern struct item_operations * item_ops [TYPE_ANY + 1];
 #define PUT_B_I_POS_UNFM_POINTER(bh,ih,pos, val) do {*(((unp_t *)B_I_PITEM(bh,ih)) + (pos)) = cpu_to_le32(val); } while (0)
 struct reiserfs_iget_args {
-    __u32 objectid ;
+        __u32 objectid;
-    __u32 dirid ;
+        __u32 dirid;
-} ;
+};
 /***************************************************************************/
 /*                    FUNCTION DECLARATIONS                                */
@@ -1595,11 +1542,11 @@ struct reiserfs_iget_args {
 /* first block written in a commit.  */
 struct reiserfs_journal_desc {
-  __le32 j_trans_id ;                   /* id of commit */
+        __le32 j_trans_id;      /* id of commit */
-  __le32 j_len ;                        /* length of commit. len +1 is the commit block */
+        __le32 j_len;           /* length of commit. len +1 is the commit block */
-  __le32 j_mount_id ;                           /* mount id of this trans*/
+        __le32 j_mount_id;      /* mount id of this trans */
-  __le32 j_realblock[1] ; /* real locations for each block */
+        __le32 j_realblock[1];  /* real locations for each block */
-} ;
+};
 #define get_desc_trans_id(d)   le32_to_cpu((d)->j_trans_id)
 #define get_desc_trans_len(d)  le32_to_cpu((d)->j_len)
@@ -1611,10 +1558,10 @@ struct reiserfs_journal_desc {
 /* last block written in a commit */
 struct reiserfs_journal_commit {
-  __le32 j_trans_id ;                   /* must match j_trans_id from the desc block */
+        __le32 j_trans_id;      /* must match j_trans_id from the desc block */
-  __le32 j_len ;                        /* ditto */
+        __le32 j_len;           /* ditto */
-  __le32 j_realblock[1] ; /* real locations for each block */
+        __le32 j_realblock[1];  /* real locations for each block */
-} ;
+};
 #define get_commit_trans_id(c) le32_to_cpu((c)->j_trans_id)
 #define get_commit_trans_len(c)        le32_to_cpu((c)->j_len)
@@ -1628,19 +1575,19 @@ struct reiserfs_journal_commit {
 ** and this transaction does not need to be replayed.
 */
 struct reiserfs_journal_header {
-  __le32 j_last_flush_trans_id ;                /* id of last fully flushed transaction */
+        __le32 j_last_flush_trans_id;   /* id of last fully flushed transaction */
-  __le32 j_first_unflushed_offset ;      /* offset in the log of where to start replay after a crash */
+        __le32 j_first_unflushed_offset;        /* offset in the log of where to start replay after a crash */
-  __le32 j_mount_id ;
+        __le32 j_mount_id;
-  /* 12 */ struct journal_params jh_journal;
+        /* 12 */ struct journal_params jh_journal;
-} ;
+};
 /* biggest tunable defines are right here */
-#define JOURNAL_BLOCK_COUNT 8192 /* number of blocks in the journal */
+#define JOURNAL_BLOCK_COUNT 8192        /* number of blocks in the journal */
-#define JOURNAL_TRANS_MAX_DEFAULT 1024   /* biggest possible single transaction, don't change for now (8/3/99) */
+#define JOURNAL_TRANS_MAX_DEFAULT 1024  /* biggest possible single transaction, don't change for now (8/3/99) */
 #define JOURNAL_TRANS_MIN_DEFAULT 256
-#define JOURNAL_MAX_BATCH_DEFAULT   900 /* max blocks to batch into one transaction, don't make this any bigger than 900 */
+#define JOURNAL_MAX_BATCH_DEFAULT   900 /* max blocks to batch into one transaction, don't make this any bigger than 900 */
 #define JOURNAL_MIN_RATIO 2
-#define JOURNAL_MAX_COMMIT_AGE 30 
+#define JOURNAL_MAX_COMMIT_AGE 30
 #define JOURNAL_MAX_TRANS_AGE 30
 #define JOURNAL_PER_BALANCE_CNT (3 * (MAX_HEIGHT-2) + 9)
 #ifdef CONFIG_QUOTA
@@ -1664,10 +1611,10 @@ struct reiserfs_journal_header {
 ** the current number of nodes is > max, the node is freed, otherwise, 
 ** it is put on a free list for faster use later.
 */
-#define REISERFS_MIN_BITMAP_NODES 10 
+#define REISERFS_MIN_BITMAP_NODES 10
-#define REISERFS_MAX_BITMAP_NODES 100 
+#define REISERFS_MAX_BITMAP_NODES 100
-#define JBH_HASH_SHIFT 13 /* these are based on journal hash size of 8192 */
+#define JBH_HASH_SHIFT 13       /* these are based on journal hash size of 8192 */
 #define JBH_HASH_MASK 8191
 #define _jhashfn(sb,block)      \
@@ -1681,14 +1628,14 @@ struct reiserfs_journal_header {
 #define journal_bread(s, block) __bread(SB_JOURNAL(s)->j_dev_bd, block, s->s_blocksize)
 enum reiserfs_bh_state_bits {
-    BH_JDirty = BH_PrivateStart, /* buffer is in current transaction */
+        BH_JDirty = BH_PrivateStart,    /* buffer is in current transaction */
-    BH_JDirty_wait,
+        BH_JDirty_wait,
-    BH_JNew,                     /* disk block was taken off free list before
+        BH_JNew,                /* disk block was taken off free list before
-                                  * being in a finished transaction, or
+                                 * being in a finished transaction, or
-                                  * written to disk. Can be reused immed. */
+                                 * written to disk. Can be reused immed. */
-    BH_JPrepared,
+        BH_JPrepared,
-    BH_JRestore_dirty,
+        BH_JRestore_dirty,
-    BH_JTest, // debugging only will go away
+        BH_JTest,               // debugging only will go away
 };
 BUFFER_FNS(JDirty, journaled);
@@ -1708,175 +1655,192 @@ TAS_BUFFER_FNS(JTest, journal_test);
 ** transaction handle which is passed around for all journal calls
 */
 struct reiserfs_transaction_handle {
-  struct super_block *t_super ; /* super for this FS when journal_begin was
+        struct super_block *t_super;    /* super for this FS when journal_begin was
-                                   called. saves calls to reiserfs_get_super
+                                           called. saves calls to reiserfs_get_super
-                                   also used by nested transactions to make
+                                           also used by nested transactions to make
-                                   sure they are nesting on the right FS
+                                           sure they are nesting on the right FS
-                                   _must_ be first in the handle
+                                           _must_ be first in the handle
-                                */
+                                         */
-  int t_refcount;
+        int t_refcount;
-  int t_blocks_logged ;         /* number of blocks this writer has logged */
+        int t_blocks_logged;    /* number of blocks this writer has logged */
-  int t_blocks_allocated ;      /* number of blocks this writer allocated */
+        int t_blocks_allocated; /* number of blocks this writer allocated */
-  unsigned long t_trans_id ;    /* sanity check, equals the current trans id */
+        unsigned long t_trans_id;       /* sanity check, equals the current trans id */
-  void *t_handle_save ;         /* save existing current->journal_info */
+        void *t_handle_save;    /* save existing current->journal_info */
-  unsigned displace_new_blocks:1; /* if new block allocation occurres, that block
+        unsigned displace_new_blocks:1; /* if new block allocation occurres, that block
-                                   should be displaced from others */
+                                           should be displaced from others */
-  struct list_head t_list;
+        struct list_head t_list;
-} ;
+};
 /* used to keep track of ordered and tail writes, attached to the buffer
 * head through b_journal_head.
 */
 struct reiserfs_jh {
-    struct reiserfs_journal_list *jl;
+        struct reiserfs_journal_list *jl;
-    struct buffer_head *bh;
+        struct buffer_head *bh;
-    struct list_head list;
+        struct list_head list;
 };
 void reiserfs_free_jh(struct buffer_head *bh);
 int reiserfs_add_tail_list(struct inode *inode, struct buffer_head *bh);
 int reiserfs_add_ordered_list(struct inode *inode, struct buffer_head *bh);
-int journal_mark_dirty(struct reiserfs_transaction_handle *, struct super_block *, struct buffer_head *bh) ;
+int journal_mark_dirty(struct reiserfs_transaction_handle *,
+                       struct super_block *, struct buffer_head *bh);
-static inline int
-reiserfs_file_data_log(struct inode *inode) {
+static inline int reiserfs_file_data_log(struct inode *inode)
-    if (reiserfs_data_log(inode->i_sb) ||
+{
-       (REISERFS_I(inode)->i_flags & i_data_log))
+        if (reiserfs_data_log(inode->i_sb) ||
-        return 1 ;
+            (REISERFS_I(inode)->i_flags & i_data_log))
-    return 0 ;
+                return 1;
+        return 0;
 }
-static inline int reiserfs_transaction_running(struct super_block *s) {
+static inline int reiserfs_transaction_running(struct super_block *s)
-    struct reiserfs_transaction_handle *th = current->journal_info ;
+{
-    if (th && th->t_super == s)
+        struct reiserfs_transaction_handle *th = current->journal_info;
-        return 1 ;
+        if (th && th->t_super == s)
-    if (th && th->t_super == NULL)
+                return 1;
-        BUG();
+        if (th && th->t_super == NULL)
-    return 0 ;
+                BUG();
+        return 0;
 }
 int reiserfs_async_progress_wait(struct super_block *s);
-struct reiserfs_transaction_handle *
+struct reiserfs_transaction_handle *reiserfs_persistent_transaction(struct
-reiserfs_persistent_transaction(struct super_block *, int count);
+                                                                    super_block
+                                                                    *,
+                                                                    int count);
 int reiserfs_end_persistent_transaction(struct reiserfs_transaction_handle *);
 int reiserfs_commit_page(struct inode *inode, struct page *page,
-                unsigned from, unsigned to);
+                         unsigned from, unsigned to);
 int reiserfs_flush_old_commits(struct super_block *);
-int reiserfs_commit_for_inode(struct inode *) ;
+int reiserfs_commit_for_inode(struct inode *);
-int  reiserfs_inode_needs_commit(struct inode *) ;
+int reiserfs_inode_needs_commit(struct inode *);
-void reiserfs_update_inode_transaction(struct inode *) ;
+void reiserfs_update_inode_transaction(struct inode *);
-void reiserfs_wait_on_write_block(struct super_block *s) ;
+void reiserfs_wait_on_write_block(struct super_block *s);
-void reiserfs_block_writes(struct reiserfs_transaction_handle *th) ;
+void reiserfs_block_writes(struct reiserfs_transaction_handle *th);
-void reiserfs_allow_writes(struct super_block *s) ;
+void reiserfs_allow_writes(struct super_block *s);
-void reiserfs_check_lock_depth(struct super_block *s, char *caller) ;
+void reiserfs_check_lock_depth(struct super_block *s, char *caller);
-int reiserfs_prepare_for_journal(struct super_block *, struct buffer_head *bh, int wait) ;
+int reiserfs_prepare_for_journal(struct super_block *, struct buffer_head *bh,
-void reiserfs_restore_prepared_buffer(struct super_block *, struct buffer_head *bh) ;
+                                 int wait);
-int journal_init(struct super_block *, const char * j_dev_name, int old_format, unsigned int) ;
+void reiserfs_restore_prepared_buffer(struct super_block *,
-int journal_release(struct reiserfs_transaction_handle*, struct super_block *) ;
+                                      struct buffer_head *bh);
-int journal_release_error(struct reiserfs_transaction_handle*, struct super_block *) ;
+int journal_init(struct super_block *, const char *j_dev_name, int old_format,
-int journal_end(struct reiserfs_transaction_handle *, struct super_block *, unsigned long) ;
+                 unsigned int);
-int journal_end_sync(struct reiserfs_transaction_handle *, struct super_block *, unsigned long) ;
+int journal_release(struct reiserfs_transaction_handle *, struct super_block *);
-int journal_mark_freed(struct reiserfs_transaction_handle *, struct super_block *, b_blocknr_t blocknr) ;
+int journal_release_error(struct reiserfs_transaction_handle *,
-int journal_transaction_should_end(struct reiserfs_transaction_handle *, int) ;
+                          struct super_block *);
-int reiserfs_in_journal(struct super_block *p_s_sb, int bmap_nr, int bit_nr, int searchall, b_blocknr_t *next) ;
+int journal_end(struct reiserfs_transaction_handle *, struct super_block *,
-int journal_begin(struct reiserfs_transaction_handle *, struct super_block *p_s_sb, unsigned long) ;
+                unsigned long);
-int journal_join_abort(struct reiserfs_transaction_handle *, struct super_block *p_s_sb, unsigned long) ;
+int journal_end_sync(struct reiserfs_transaction_handle *, struct super_block *,
-void reiserfs_journal_abort (struct super_block *sb, int errno);
+                     unsigned long);
-void reiserfs_abort (struct super_block *sb, int errno, const char *fmt, ...);
+int journal_mark_freed(struct reiserfs_transaction_handle *,
-int reiserfs_allocate_list_bitmaps(struct super_block *s, struct reiserfs_list_bitmap *, int) ;
+                       struct super_block *, b_blocknr_t blocknr);
+int journal_transaction_should_end(struct reiserfs_transaction_handle *, int);
-void add_save_link (struct reiserfs_transaction_handle * th,
+int reiserfs_in_journal(struct super_block *p_s_sb, int bmap_nr, int bit_nr,
-                                        struct inode * inode, int truncate);
+                        int searchall, b_blocknr_t * next);
-int remove_save_link (struct inode * inode, int truncate);
+int journal_begin(struct reiserfs_transaction_handle *,
+                  struct super_block *p_s_sb, unsigned long);
+int journal_join_abort(struct reiserfs_transaction_handle *,
+                       struct super_block *p_s_sb, unsigned long);
+void reiserfs_journal_abort(struct super_block *sb, int errno);
+void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...);
+int reiserfs_allocate_list_bitmaps(struct super_block *s,
+                                   struct reiserfs_list_bitmap *, int);
+void add_save_link(struct reiserfs_transaction_handle *th,
+                   struct inode *inode, int truncate);
+int remove_save_link(struct inode *inode, int truncate);
 /* objectid.c */
-__u32 reiserfs_get_unused_objectid (struct reiserfs_transaction_handle *th);
+__u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th);
-void reiserfs_release_objectid (struct reiserfs_transaction_handle *th, __u32 objectid_to_release);
+void reiserfs_release_objectid(struct reiserfs_transaction_handle *th,
-int reiserfs_convert_objectid_map_v1(struct super_block *) ;
+                               __u32 objectid_to_release);
+int reiserfs_convert_objectid_map_v1(struct super_block *);
 /* stree.c */
 int B_IS_IN_TREE(const struct buffer_head *);
-extern void copy_item_head(struct item_head * p_v_to,
+extern void copy_item_head(struct item_head *p_v_to,
-                                                                  const struct item_head * p_v_from);
+                           const struct item_head *p_v_from);
 // first key is in cpu form, second - le
-extern int  comp_short_keys (const struct reiserfs_key * le_key,
+extern int comp_short_keys(const struct reiserfs_key *le_key,
-                                    const struct cpu_key * cpu_key);
+                           const struct cpu_key *cpu_key);
-extern void le_key2cpu_key (struct cpu_key * to, const struct reiserfs_key * from);
+extern void le_key2cpu_key(struct cpu_key *to, const struct reiserfs_key *from);
 // both are in le form
-extern int comp_le_keys (const struct reiserfs_key *, const struct reiserfs_key *);
+extern int comp_le_keys(const struct reiserfs_key *,
-extern int comp_short_le_keys (const struct reiserfs_key *, const struct reiserfs_key *);
+                        const struct reiserfs_key *);
+extern int comp_short_le_keys(const struct reiserfs_key *,
+                              const struct reiserfs_key *);
 //
 // get key version from on disk key - kludge
 //
-static inline int le_key_version (const struct reiserfs_key * key)
+static inline int le_key_version(const struct reiserfs_key *key)
 {
-    int type;
+        int type;
-    
-    type = offset_v2_k_type( &(key->u.k_offset_v2));
-    if (type != TYPE_DIRECT && type != TYPE_INDIRECT && type != TYPE_DIRENTRY)
-        return KEY_FORMAT_3_5;
-    return KEY_FORMAT_3_6;
-        
-}
+        type = offset_v2_k_type(&(key->u.k_offset_v2));
+        if (type != TYPE_DIRECT && type != TYPE_INDIRECT
+            && type != TYPE_DIRENTRY)
+                return KEY_FORMAT_3_5;
+        return KEY_FORMAT_3_6;
-static inline void copy_key (struct reiserfs_key *to, const struct reiserfs_key *from)
-{
-    memcpy (to, from, KEY_SIZE);
 }
+static inline void copy_key(struct reiserfs_key *to,
+                            const struct reiserfs_key *from)
+{
+        memcpy(to, from, KEY_SIZE);
+}
-int comp_items (const struct item_head * stored_ih, const struct path * p_s_path);
+int comp_items(const struct item_head *stored_ih, const struct path *p_s_path);
-const struct reiserfs_key * get_rkey (const struct path * p_s_chk_path,
+const struct reiserfs_key *get_rkey(const struct path *p_s_chk_path,
-                                                         const struct super_block  * p_s_sb);
+                                    const struct super_block *p_s_sb);
-int search_by_key (struct super_block *, const struct cpu_key *, 
+int search_by_key(struct super_block *, const struct cpu_key *,
-                                   struct path *, int);
+                  struct path *, int);
 #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL)
-int search_for_position_by_key (struct super_block * p_s_sb, 
+int search_for_position_by_key(struct super_block *p_s_sb,
-                                                                const struct cpu_key * p_s_cpu_key, 
+                               const struct cpu_key *p_s_cpu_key,
-                                                                struct path * p_s_search_path);
+                               struct path *p_s_search_path);
-extern void decrement_bcount (struct buffer_head * p_s_bh);
+extern void decrement_bcount(struct buffer_head *p_s_bh);
-void decrement_counters_in_path (struct path * p_s_search_path);
+void decrement_counters_in_path(struct path *p_s_search_path);
-void pathrelse (struct path * p_s_search_path);
+void pathrelse(struct path *p_s_search_path);
-int reiserfs_check_path(struct path *p) ;
+int reiserfs_check_path(struct path *p);
-void pathrelse_and_restore (struct super_block *s, struct path * p_s_search_path);
+void pathrelse_and_restore(struct super_block *s, struct path *p_s_search_path);
-int reiserfs_insert_item (struct reiserfs_transaction_handle *th, 
+int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
-                          struct path * path, 
+                         struct path *path,
-                          const struct cpu_key * key,
+                         const struct cpu_key *key,
-                          struct item_head * ih,
+                         struct item_head *ih,
-                          struct inode *inode, const char * body);
+                         struct inode *inode, const char *body);
-int reiserfs_paste_into_item (struct reiserfs_transaction_handle *th,
+int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th,
-                              struct path * path,
+                             struct path *path,
-                              const struct cpu_key * key,
+                             const struct cpu_key *key,
-                              struct inode *inode,
+                             struct inode *inode,
-                              const char * body, int paste_size);
+                             const char *body, int paste_size);
-int reiserfs_cut_from_item (struct reiserfs_transaction_handle *th,
+int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
-                            struct path * path,
+                           struct path *path,
-                            struct cpu_key * key,
+                           struct cpu_key *key,
-                            struct inode * inode,
+                           struct inode *inode,
-                            struct page *page,
+                           struct page *page, loff_t new_file_size);
-                            loff_t new_file_size);
+int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
-int reiserfs_delete_item (struct reiserfs_transaction_handle *th,
+                         struct path *path,
-                          struct path * path, 
+                         const struct cpu_key *key,
-                          const struct cpu_key * key,
+                         struct inode *inode, struct buffer_head *p_s_un_bh);
-                          struct inode * inode, 
-                          struct buffer_head  * p_s_un_bh);
+void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,
+                                struct inode *inode, struct reiserfs_key *key);
-void reiserfs_delete_solid_item (struct reiserfs_transaction_handle *th,
+int reiserfs_delete_object(struct reiserfs_transaction_handle *th,
-                        struct inode *inode, struct reiserfs_key * key);
+                           struct inode *p_s_inode);
-int reiserfs_delete_object (struct reiserfs_transaction_handle *th, struct inode * p_s_inode);
+int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
-int reiserfs_do_truncate (struct reiserfs_transaction_handle *th,
+                         struct inode *p_s_inode, struct page *,
-                           struct  inode * p_s_inode, struct page *, 
+                         int update_timestamps);
-                           int update_timestamps);
 #define i_block_size(inode) ((inode)->i_sb->s_blocksize)
 #define file_size(inode) ((inode)->i_size)
@@ -1885,66 +1849,67 @@ int reiserfs_do_truncate (struct reiserfs_transaction_handle *th,
 #define tail_has_to_be_packed(inode) (have_large_tails ((inode)->i_sb)?\
 !STORE_TAIL_IN_UNFM_S1(file_size (inode), tail_size(inode), inode->i_sb->s_blocksize):have_small_tails ((inode)->i_sb)?!STORE_TAIL_IN_UNFM_S2(file_size (inode), tail_size(inode), inode->i_sb->s_blocksize):0 )
-void padd_item (char * item, int total_length, int length);
+void padd_item(char *item, int total_length, int length);
 /* inode.c */
 /* args for the create parameter of reiserfs_get_block */
-#define GET_BLOCK_NO_CREATE 0 /* don't create new blocks or convert tails */
+#define GET_BLOCK_NO_CREATE 0   /* don't create new blocks or convert tails */
-#define GET_BLOCK_CREATE 1    /* add anything you need to find block */
+#define GET_BLOCK_CREATE 1      /* add anything you need to find block */
-#define GET_BLOCK_NO_HOLE 2   /* return -ENOENT for file holes */
+#define GET_BLOCK_NO_HOLE 2     /* return -ENOENT for file holes */
-#define GET_BLOCK_READ_DIRECT 4  /* read the tail if indirect item not found */
+#define GET_BLOCK_READ_DIRECT 4 /* read the tail if indirect item not found */
-#define GET_BLOCK_NO_ISEM     8 /* i_sem is not held, don't preallocate */
+#define GET_BLOCK_NO_ISEM     8 /* i_sem is not held, don't preallocate */
-#define GET_BLOCK_NO_DANGLE   16 /* don't leave any transactions running */
+#define GET_BLOCK_NO_DANGLE   16        /* don't leave any transactions running */
-int restart_transaction(struct reiserfs_transaction_handle *th, struct inode *inode, struct path *path);
+int restart_transaction(struct reiserfs_transaction_handle *th,
-void reiserfs_read_locked_inode(struct inode * inode, struct reiserfs_iget_args *args) ;
+                        struct inode *inode, struct path *path);
-int reiserfs_find_actor(struct inode * inode, void *p) ;
+void reiserfs_read_locked_inode(struct inode *inode,
-int reiserfs_init_locked_inode(struct inode * inode, void *p) ;
+                                struct reiserfs_iget_args *args);
-void reiserfs_delete_inode (struct inode * inode);
+int reiserfs_find_actor(struct inode *inode, void *p);
-int reiserfs_write_inode (struct inode * inode, int) ;
+int reiserfs_init_locked_inode(struct inode *inode, void *p);
-int reiserfs_get_block (struct inode * inode, sector_t block, struct buffer_head * bh_result, int create);
+void reiserfs_delete_inode(struct inode *inode);
-struct dentry *reiserfs_get_dentry(struct super_block *, void *) ;
+int reiserfs_write_inode(struct inode *inode, int);
-struct dentry *reiserfs_decode_fh(struct super_block *sb, __u32 *data,
+int reiserfs_get_block(struct inode *inode, sector_t block,
-                                     int len, int fhtype,
+                       struct buffer_head *bh_result, int create);
-                                  int (*acceptable)(void *contect, struct dentry *de),
+struct dentry *reiserfs_get_dentry(struct super_block *, void *);
-                                  void *context) ;
+struct dentry *reiserfs_decode_fh(struct super_block *sb, __u32 * data,
-int reiserfs_encode_fh( struct dentry *dentry, __u32 *data, int *lenp, 
+                                  int len, int fhtype,
-                                                int connectable );
+                                  int (*acceptable) (void *contect,
+                                                     struct dentry * de),
-int reiserfs_truncate_file(struct inode *, int update_timestamps) ;
+                                  void *context);
-void make_cpu_key (struct cpu_key * cpu_key, struct inode * inode, loff_t offset,
+int reiserfs_encode_fh(struct dentry *dentry, __u32 * data, int *lenp,
-                   int type, int key_length);
+                       int connectable);
-void make_le_item_head (struct item_head * ih, const struct cpu_key * key, 
-                        int version,
+int reiserfs_truncate_file(struct inode *, int update_timestamps);
-                        loff_t offset, int type, int length, int entry_count);
+void make_cpu_key(struct cpu_key *cpu_key, struct inode *inode, loff_t offset,
-struct inode * reiserfs_iget (struct super_block * s, 
+                  int type, int key_length);
-                              const struct cpu_key * key);
+void make_le_item_head(struct item_head *ih, const struct cpu_key *key,
+                       int version,
+                       loff_t offset, int type, int length, int entry_count);
-int reiserfs_new_inode (struct reiserfs_transaction_handle *th, 
+struct inode *reiserfs_iget(struct super_block *s, const struct cpu_key *key);
-                                   struct inode * dir, int mode, 
-                                   const char * symname, loff_t i_size,
+int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
-                                   struct dentry *dentry, struct inode *inode);
+                       struct inode *dir, int mode,
+                       const char *symname, loff_t i_size,
-void reiserfs_update_sd_size (struct reiserfs_transaction_handle *th,
+                       struct dentry *dentry, struct inode *inode);
-                              struct inode * inode, loff_t size);
+void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th,
+                             struct inode *inode, loff_t size);
 static inline void reiserfs_update_sd(struct reiserfs_transaction_handle *th,
-                                      struct inode *inode)
+                                      struct inode *inode)
 {
-    reiserfs_update_sd_size(th, inode, inode->i_size) ;
+        reiserfs_update_sd_size(th, inode, inode->i_size);
 }
-void sd_attrs_to_i_attrs( __u16 sd_attrs, struct inode *inode );
+void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
-void i_attrs_to_sd_attrs( struct inode *inode, __u16 *sd_attrs );
+void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
 int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
 /* namei.c */
-void set_de_name_and_namelen (struct reiserfs_dir_entry * de);
+void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-int search_by_entry_key (struct super_block * sb, const struct cpu_key * key, 
+int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
-                         struct path * path, 
+                        struct path *path, struct reiserfs_dir_entry *de);
-                         struct reiserfs_dir_entry * de);
+struct dentry *reiserfs_get_parent(struct dentry *);
-struct dentry *reiserfs_get_parent(struct dentry *) ;
 /* procfs.c */
 #if defined( CONFIG_PROC_FS ) && defined( CONFIG_REISERFS_PROC_INFO )
@@ -1953,15 +1918,15 @@ struct dentry *reiserfs_get_parent(struct dentry *) ;
 #undef REISERFS_PROC_INFO
 #endif
-int reiserfs_proc_info_init( struct super_block *sb );
+int reiserfs_proc_info_init(struct super_block *sb);
-int reiserfs_proc_info_done( struct super_block *sb );
+int reiserfs_proc_info_done(struct super_block *sb);
-struct proc_dir_entry *reiserfs_proc_register_global( char *name, 
+struct proc_dir_entry *reiserfs_proc_register_global(char *name,
-                                                                                                          read_proc_t *func );
+                                                     read_proc_t * func);
-void reiserfs_proc_unregister_global( const char *name );
+void reiserfs_proc_unregister_global(const char *name);
-int reiserfs_proc_info_global_init( void );
+int reiserfs_proc_info_global_init(void);
-int reiserfs_proc_info_global_done( void );
+int reiserfs_proc_info_global_done(void);
-int reiserfs_global_version_in_proc( char *buffer, char **start, off_t offset,
+int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset,
-                                                                         int count, int *eof, void *data );
+                                    int count, int *eof, void *data);
 #if defined( REISERFS_PROC_INFO )
@@ -1993,123 +1958,132 @@ extern struct inode_operations reiserfs_special_inode_operations;
 extern struct file_operations reiserfs_dir_operations;
 /* tail_conversion.c */
-int direct2indirect (struct reiserfs_transaction_handle *, struct inode *, struct path *, struct buffer_head *, loff_t);
+int direct2indirect(struct reiserfs_transaction_handle *, struct inode *,
-int indirect2direct (struct reiserfs_transaction_handle *, struct inode *, struct page *, struct path *, const struct cpu_key *, loff_t, char *);
+                    struct path *, struct buffer_head *, loff_t);
-void reiserfs_unmap_buffer(struct buffer_head *) ;
+int indirect2direct(struct reiserfs_transaction_handle *, struct inode *,
+                    struct page *, struct path *, const struct cpu_key *,
+                    loff_t, char *);
+void reiserfs_unmap_buffer(struct buffer_head *);
 /* file.c */
 extern struct inode_operations reiserfs_file_inode_operations;
 extern struct file_operations reiserfs_file_operations;
-extern struct address_space_operations reiserfs_address_space_operations ;
+extern struct address_space_operations reiserfs_address_space_operations;
 /* fix_nodes.c */
 #ifdef CONFIG_REISERFS_CHECK
-void * reiserfs_kmalloc (size_t size, int flags, struct super_block * s);
+void *reiserfs_kmalloc(size_t size, int flags, struct super_block *s);
-void reiserfs_kfree (const void * vp, size_t size, struct super_block * s);
+void reiserfs_kfree(const void *vp, size_t size, struct super_block *s);
 #else
 static inline void *reiserfs_kmalloc(size_t size, int flags,
-                                        struct super_block *s)
+                                     struct super_block *s)
 {
        return kmalloc(size, flags);
 }
 static inline void reiserfs_kfree(const void *vp, size_t size,
-                                        struct super_block *s)
+                                  struct super_block *s)
 {
        kfree(vp);
 }
 #endif
-int fix_nodes (int n_op_mode, struct tree_balance * p_s_tb, 
+int fix_nodes(int n_op_mode, struct tree_balance *p_s_tb,
-               struct item_head * p_s_ins_ih, const void *);
+              struct item_head *p_s_ins_ih, const void *);
-void unfix_nodes (struct tree_balance *);
+void unfix_nodes(struct tree_balance *);
 /* prints.c */
-void reiserfs_panic (struct super_block * s, const char * fmt, ...) __attribute__ ( ( noreturn ) );
+void reiserfs_panic(struct super_block *s, const char *fmt, ...)
-void reiserfs_info (struct super_block *s, const char * fmt, ...);
+    __attribute__ ((noreturn));
-void reiserfs_debug (struct super_block *s, int level, const char * fmt, ...);
+void reiserfs_info(struct super_block *s, const char *fmt, ...);
-void print_indirect_item (struct buffer_head * bh, int item_num);
+void reiserfs_debug(struct super_block *s, int level, const char *fmt, ...);
-void store_print_tb (struct tree_balance * tb);
+void print_indirect_item(struct buffer_head *bh, int item_num);
-void print_cur_tb (char * mes);
+void store_print_tb(struct tree_balance *tb);
-void print_de (struct reiserfs_dir_entry * de);
+void print_cur_tb(char *mes);
-void print_bi (struct buffer_info * bi, char * mes);
+void print_de(struct reiserfs_dir_entry *de);
-#define PRINT_LEAF_ITEMS 1   /* print all items */
+void print_bi(struct buffer_info *bi, char *mes);
-#define PRINT_DIRECTORY_ITEMS 2 /* print directory items */
+#define PRINT_LEAF_ITEMS 1      /* print all items */
-#define PRINT_DIRECT_ITEMS 4 /* print contents of direct items */
+#define PRINT_DIRECTORY_ITEMS 2 /* print directory items */
-void print_block (struct buffer_head * bh, ...);
+#define PRINT_DIRECT_ITEMS 4    /* print contents of direct items */
-void print_bmap (struct super_block * s, int silent);
+void print_block(struct buffer_head *bh, ...);
-void print_bmap_block (int i, char * data, int size, int silent);
+void print_bmap(struct super_block *s, int silent);
+void print_bmap_block(int i, char *data, int size, int silent);
 /*void print_super_block (struct super_block * s, char * mes);*/
-void print_objectid_map (struct super_block * s);
+void print_objectid_map(struct super_block *s);
-void print_block_head (struct buffer_head * bh, char * mes);
+void print_block_head(struct buffer_head *bh, char *mes);
-void check_leaf (struct buffer_head * bh);
+void check_leaf(struct buffer_head *bh);
-void check_internal (struct buffer_head * bh);
+void check_internal(struct buffer_head *bh);
-void print_statistics (struct super_block * s);
+void print_statistics(struct super_block *s);
-char * reiserfs_hashname(int code);
+char *reiserfs_hashname(int code);
 /* lbalance.c */
-int leaf_move_items (int shift_mode, struct tree_balance * tb, int mov_num, int mov_bytes, struct buffer_head * Snew);
+int leaf_move_items(int shift_mode, struct tree_balance *tb, int mov_num,
-int leaf_shift_left (struct tree_balance * tb, int shift_num, int shift_bytes);
+                    int mov_bytes, struct buffer_head *Snew);
-int leaf_shift_right (struct tree_balance * tb, int shift_num, int shift_bytes);
+int leaf_shift_left(struct tree_balance *tb, int shift_num, int shift_bytes);
-void leaf_delete_items (struct buffer_info * cur_bi, int last_first, int first, int del_num, int del_bytes);
+int leaf_shift_right(struct tree_balance *tb, int shift_num, int shift_bytes);
-void leaf_insert_into_buf (struct buffer_info * bi, int before, 
+void leaf_delete_items(struct buffer_info *cur_bi, int last_first, int first,
-                           struct item_head * inserted_item_ih, const char * inserted_item_body, int zeros_number);
+                       int del_num, int del_bytes);
-void leaf_paste_in_buffer (struct buffer_info * bi, int pasted_item_num, 
+void leaf_insert_into_buf(struct buffer_info *bi, int before,
-                           int pos_in_item, int paste_size, const char * body, int zeros_number);
+                          struct item_head *inserted_item_ih,
-void leaf_cut_from_buffer (struct buffer_info * bi, int cut_item_num, int pos_in_item, 
+                          const char *inserted_item_body, int zeros_number);
-                           int cut_size);
+void leaf_paste_in_buffer(struct buffer_info *bi, int pasted_item_num,
-void leaf_paste_entries (struct buffer_head * bh, int item_num, int before, 
+                          int pos_in_item, int paste_size, const char *body,
-                         int new_entry_count, struct reiserfs_de_head * new_dehs, const char * records, int paste_size);
+                          int zeros_number);
+void leaf_cut_from_buffer(struct buffer_info *bi, int cut_item_num,
+                          int pos_in_item, int cut_size);
+void leaf_paste_entries(struct buffer_head *bh, int item_num, int before,
+                        int new_entry_count, struct reiserfs_de_head *new_dehs,
+                        const char *records, int paste_size);
 /* ibalance.c */
-int balance_internal (struct tree_balance * , int, int, struct item_head * , 
+int balance_internal(struct tree_balance *, int, int, struct item_head *,
-                      struct buffer_head **);
+                     struct buffer_head **);
 /* do_balance.c */
-void do_balance_mark_leaf_dirty (struct tree_balance * tb,
+void do_balance_mark_leaf_dirty(struct tree_balance *tb,
-                                        struct buffer_head * bh, int flag);
+                                struct buffer_head *bh, int flag);
 #define do_balance_mark_internal_dirty do_balance_mark_leaf_dirty
 #define do_balance_mark_sb_dirty do_balance_mark_leaf_dirty
-void do_balance (struct tree_balance * tb, struct item_head * ih, 
+void do_balance(struct tree_balance *tb, struct item_head *ih,
-                 const char * body, int flag);
+                const char *body, int flag);
-void reiserfs_invalidate_buffer (struct tree_balance * tb, struct buffer_head * bh);
+void reiserfs_invalidate_buffer(struct tree_balance *tb,
+                                struct buffer_head *bh);
-int get_left_neighbor_position (struct tree_balance * tb, int h);
+int get_left_neighbor_position(struct tree_balance *tb, int h);
-int get_right_neighbor_position (struct tree_balance * tb, int h);
+int get_right_neighbor_position(struct tree_balance *tb, int h);
-void replace_key (struct tree_balance * tb, struct buffer_head *, int, struct buffer_head *, int);
+void replace_key(struct tree_balance *tb, struct buffer_head *, int,
-void make_empty_node (struct buffer_info *);
+                 struct buffer_head *, int);
-struct buffer_head * get_FEB (struct tree_balance *);
+void make_empty_node(struct buffer_info *);
+struct buffer_head *get_FEB(struct tree_balance *);
 /* bitmap.c */
 /* structure contains hints for block allocator, and it is a container for
 * arguments, such as node, search path, transaction_handle, etc. */
- struct __reiserfs_blocknr_hint {
+struct __reiserfs_blocknr_hint {
-     struct inode * inode;              /* inode passed to allocator, if we allocate unf. nodes */
+        struct inode *inode;    /* inode passed to allocator, if we allocate unf. nodes */
-     long block;                        /* file offset, in blocks */
+        long block;             /* file offset, in blocks */
-     struct in_core_key key;
+        struct in_core_key key;
-     struct path * path;                /* search path, used by allocator to deternine search_start by
+        struct path *path;      /* search path, used by allocator to deternine search_start by
-                                         * various ways */
+                                 * various ways */
-     struct reiserfs_transaction_handle * th; /* transaction handle is needed to log super blocks and
+        struct reiserfs_transaction_handle *th; /* transaction handle is needed to log super blocks and
-                                               * bitmap blocks changes  */
+                                                 * bitmap blocks changes  */
-     b_blocknr_t beg, end;
+        b_blocknr_t beg, end;
-     b_blocknr_t search_start;          /* a field used to transfer search start value (block number)
+        b_blocknr_t search_start;       /* a field used to transfer search start value (block number)
                                         * between different block allocator procedures
                                         * (determine_search_start() and others) */
-    int prealloc_size;                  /* is set in determine_prealloc_size() function, used by underlayed
+        int prealloc_size;      /* is set in determine_prealloc_size() function, used by underlayed
-                                         * function that do actual allocation */
+                                 * function that do actual allocation */
-    unsigned formatted_node:1;          /* the allocator uses different polices for getting disk space for
+        unsigned formatted_node:1;      /* the allocator uses different polices for getting disk space for
                                         * formatted/unformatted blocks with/without preallocation */
-    unsigned preallocate:1;
+        unsigned preallocate:1;
 };
 typedef struct __reiserfs_blocknr_hint reiserfs_blocknr_hint_t;
-int reiserfs_parse_alloc_options (struct super_block *, char *);
+int reiserfs_parse_alloc_options(struct super_block *, char *);
-void reiserfs_init_alloc_options (struct super_block *s);
+void reiserfs_init_alloc_options(struct super_block *s);
 /*
 * given a directory, this will tell you what packing locality
@@ -2118,68 +2092,72 @@ void reiserfs_init_alloc_options (struct super_block *s);
 */
 __le32 reiserfs_choose_packing(struct inode *dir);
-int is_reusable (struct super_block * s, b_blocknr_t block, int bit_value);
+int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value);
-void reiserfs_free_block (struct reiserfs_transaction_handle *th, struct inode *, b_blocknr_t, int for_unformatted);
+void reiserfs_free_block(struct reiserfs_transaction_handle *th, struct inode *,
-int reiserfs_allocate_blocknrs(reiserfs_blocknr_hint_t *, b_blocknr_t * , int, int);
+                         b_blocknr_t, int for_unformatted);
-extern inline int reiserfs_new_form_blocknrs (struct tree_balance * tb,
+int reiserfs_allocate_blocknrs(reiserfs_blocknr_hint_t *, b_blocknr_t *, int,
-                                              b_blocknr_t *new_blocknrs, int amount_needed)
+                               int);
+extern inline int reiserfs_new_form_blocknrs(struct tree_balance *tb,
+                                             b_blocknr_t * new_blocknrs,
+                                             int amount_needed)
 {
-    reiserfs_blocknr_hint_t hint = {
+        reiserfs_blocknr_hint_t hint = {
-        .th = tb->transaction_handle,
+                .th = tb->transaction_handle,
-        .path = tb->tb_path,
+                .path = tb->tb_path,
-        .inode = NULL,
+                .inode = NULL,
-        .key = tb->key,
+                .key = tb->key,
-        .block = 0,
+                .block = 0,
-        .formatted_node = 1
+                .formatted_node = 1
-    };
+        };
-    return reiserfs_allocate_blocknrs(&hint, new_blocknrs, amount_needed, 0);
+        return reiserfs_allocate_blocknrs(&hint, new_blocknrs, amount_needed,
+                                          0);
 }
-extern inline int reiserfs_new_unf_blocknrs (struct reiserfs_transaction_handle *th,
+extern inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle
-                                             struct inode *inode,
+                                            *th, struct inode *inode,
-                                             b_blocknr_t *new_blocknrs,
+                                            b_blocknr_t * new_blocknrs,
-                                             struct path * path, long block)
+                                            struct path *path, long block)
 {
-    reiserfs_blocknr_hint_t hint = {
+        reiserfs_blocknr_hint_t hint = {
-        .th = th,
+                .th = th,
-        .path = path,
+                .path = path,
-        .inode = inode,
+                .inode = inode,
-        .block = block,
+                .block = block,
-        .formatted_node = 0,
+                .formatted_node = 0,
-        .preallocate = 0
+                .preallocate = 0
-    };
+        };
-    return reiserfs_allocate_blocknrs(&hint, new_blocknrs, 1, 0);
+        return reiserfs_allocate_blocknrs(&hint, new_blocknrs, 1, 0);
 }
 #ifdef REISERFS_PREALLOCATE
-extern inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle *th,
+extern inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle
-                                             struct inode * inode,
+                                             *th, struct inode *inode,
-                                             b_blocknr_t *new_blocknrs,
+                                             b_blocknr_t * new_blocknrs,
-                                             struct path * path, long block)
+                                             struct path *path, long block)
 {
-    reiserfs_blocknr_hint_t hint = {
+        reiserfs_blocknr_hint_t hint = {
-        .th = th,
+                .th = th,
-        .path = path,
+                .path = path,
-        .inode = inode,
+                .inode = inode,
-        .block = block,
+                .block = block,
-        .formatted_node = 0,
+                .formatted_node = 0,
-        .preallocate = 1
+                .preallocate = 1
-    };
+        };
-    return reiserfs_allocate_blocknrs(&hint, new_blocknrs, 1, 0);
+        return reiserfs_allocate_blocknrs(&hint, new_blocknrs, 1, 0);
 }
-void reiserfs_discard_prealloc (struct reiserfs_transaction_handle *th, 
+void reiserfs_discard_prealloc(struct reiserfs_transaction_handle *th,
-                                struct inode * inode);
+                               struct inode *inode);
-void reiserfs_discard_all_prealloc (struct reiserfs_transaction_handle *th);
+void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th);
 #endif
-void reiserfs_claim_blocks_to_be_allocated( struct super_block *sb, int blocks);
+void reiserfs_claim_blocks_to_be_allocated(struct super_block *sb, int blocks);
-void reiserfs_release_claimed_blocks( struct super_block *sb, int blocks);
+void reiserfs_release_claimed_blocks(struct super_block *sb, int blocks);
 int reiserfs_can_fit_pages(struct super_block *sb);
 /* hashes.c */
-__u32 keyed_hash (const signed char *msg, int len);
+__u32 keyed_hash(const signed char *msg, int len);
-__u32 yura_hash (const signed char *msg, int len);
+__u32 yura_hash(const signed char *msg, int len);
-__u32 r5_hash (const signed char *msg, int len);
+__u32 r5_hash(const signed char *msg, int len);
 /* the ext2 bit routines adjust for big or little endian as
 ** appropriate for the arch, so in our laziness we use them rather
@@ -2199,11 +2177,10 @@ __u32 r5_hash (const signed char *msg, int len);
   absolutely safe */
 #define SPARE_SPACE 500
 /* prototypes from ioctl.c */
-int reiserfs_ioctl (struct inode * inode, struct file * filp, 
+int reiserfs_ioctl(struct inode *inode, struct file *filp,
-                    unsigned int cmd, unsigned long arg);
+                   unsigned int cmd, unsigned long arg);
- 
 /* ioctl's command */
 #define REISERFS_IOC_UNPACK             _IOW(0xCD,1,long)
 /* define following flags to be the same as in ext2, so that chattr(1),
@@ -2218,10 +2195,8 @@ int reiserfs_ioctl (struct inode * inode, struct file * filp,
   would evolve into real per-fs locks */
 #define reiserfs_write_lock( sb ) lock_kernel()
 #define reiserfs_write_unlock( sb ) unlock_kernel()
-                                 
 /* xattr stuff */
 #define REISERFS_XATTR_DIR_SEM(s) (REISERFS_SB(s)->xattr_dir_sem)
-#endif /* _LINUX_REISER_FS_H */
+#endif                          /* _LINUX_REISER_FS_H */
diff --git a/include/linux/reiserfs_fs_i.h b/include/linux/reiserfs_fs_i.h
index e321eb050d65..149be8d9a0c9 100644
--- a/include/linux/reiserfs_fs_i.h
+++ b/include/linux/reiserfs_fs_i.h
@@ -10,54 +10,53 @@ typedef enum {
    /** this says what format of key do all items (but stat data) of
      an object have.  If this is set, that format is 3.6 otherwise
      - 3.5 */
-    i_item_key_version_mask    =  0x0001,
+        i_item_key_version_mask = 0x0001,
    /** If this is unset, object has 3.5 stat data, otherwise, it has
      3.6 stat data with 64bit size, 32bit nlink etc. */
-    i_stat_data_version_mask   =  0x0002,
+        i_stat_data_version_mask = 0x0002,
    /** file might need tail packing on close */
-    i_pack_on_close_mask       =  0x0004,
+        i_pack_on_close_mask = 0x0004,
    /** don't pack tail of file */
-    i_nopack_mask              =  0x0008,
+        i_nopack_mask = 0x0008,
    /** If those is set, "safe link" was created for this file during
      truncate or unlink. Safe link is used to avoid leakage of disk
      space on crash with some files open, but unlinked. */
-    i_link_saved_unlink_mask   =  0x0010,
+        i_link_saved_unlink_mask = 0x0010,
-    i_link_saved_truncate_mask =  0x0020,
+        i_link_saved_truncate_mask = 0x0020,
-    i_has_xattr_dir            =  0x0040,
+        i_has_xattr_dir = 0x0040,
-    i_data_log                 =  0x0080,
+        i_data_log = 0x0080,
 } reiserfs_inode_flags;
 struct reiserfs_inode_info {
-    __u32 i_key [4];/* key is still 4 32 bit integers */
+        __u32 i_key[4];         /* key is still 4 32 bit integers */
    /** transient inode flags that are never stored on disk. Bitmasks
      for this field are defined above. */
-    __u32 i_flags;
+        __u32 i_flags;
-    __u32 i_first_direct_byte; // offset of first byte stored in direct item.
+        __u32 i_first_direct_byte;      // offset of first byte stored in direct item.
-    /* copy of persistent inode flags read from sd_attrs. */
+        /* copy of persistent inode flags read from sd_attrs. */
-    __u32 i_attrs;
+        __u32 i_attrs;
-    int i_prealloc_block; /* first unused block of a sequence of unused blocks */
+        int i_prealloc_block;   /* first unused block of a sequence of unused blocks */
-    int i_prealloc_count; /* length of that sequence */
+        int i_prealloc_count;   /* length of that sequence */
-    struct list_head i_prealloc_list; /* per-transaction list of inodes which
+        struct list_head i_prealloc_list;       /* per-transaction list of inodes which
-                                       * have preallocated blocks */
+                                                 * have preallocated blocks */
-    unsigned new_packing_locality:1;  /* new_packig_locality is created; new blocks
+        unsigned new_packing_locality:1;        /* new_packig_locality is created; new blocks
-                                       * for the contents of this directory should be
+                                                 * for the contents of this directory should be
-                                       * displaced */
+                                                 * displaced */
-    /* we use these for fsync or O_SYNC to decide which transaction
+        /* we use these for fsync or O_SYNC to decide which transaction
-    ** needs to be committed in order for this inode to be properly
+         ** needs to be committed in order for this inode to be properly
-    ** flushed */
+         ** flushed */
-    unsigned long i_trans_id ;
+        unsigned long i_trans_id;
-    struct reiserfs_journal_list *i_jl;
+        struct reiserfs_journal_list *i_jl;
-    struct posix_acl *i_acl_access;
+        struct posix_acl *i_acl_access;
-    struct posix_acl *i_acl_default;
+        struct posix_acl *i_acl_default;
-    struct rw_semaphore xattr_sem;
+        struct rw_semaphore xattr_sem;
-    struct inode vfs_inode;
+        struct inode vfs_inode;
 };
 #endif
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 31c709d0fe18..3e68592e52e9 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -10,7 +10,7 @@
 #endif
 typedef enum {
-  reiserfs_attrs_cleared        = 0x00000001,
+        reiserfs_attrs_cleared = 0x00000001,
 } reiserfs_super_block_flags;
 /* struct reiserfs_super_block accessors/mutators
@@ -61,7 +61,7 @@ typedef enum {
 #define sb_umount_state(sbp)       (le16_to_cpu((sbp)->s_v1.s_umount_state))
 #define set_sb_umount_state(sbp,v) ((sbp)->s_v1.s_umount_state = cpu_to_le16(v))
 #define sb_fs_state(sbp)           (le16_to_cpu((sbp)->s_v1.s_fs_state))
-#define set_sb_fs_state(sbp,v)     ((sbp)->s_v1.s_fs_state = cpu_to_le16(v)) 
+#define set_sb_fs_state(sbp,v)     ((sbp)->s_v1.s_fs_state = cpu_to_le16(v))
 #define sb_hash_function_code(sbp) \
              (le32_to_cpu((sbp)->s_v1.s_hash_function_code))
 #define set_sb_hash_function_code(sbp,v) \
@@ -103,10 +103,10 @@ typedef enum {
 /* don't mess with these for a while */
                                /* we have a node size define somewhere in reiserfs_fs.h. -Hans */
-#define JOURNAL_BLOCK_SIZE  4096 /* BUG gotta get rid of this */
+#define JOURNAL_BLOCK_SIZE  4096        /* BUG gotta get rid of this */
-#define JOURNAL_MAX_CNODE   1500 /* max cnodes to allocate. */
+#define JOURNAL_MAX_CNODE   1500        /* max cnodes to allocate. */
-#define JOURNAL_HASH_SIZE 8192   
+#define JOURNAL_HASH_SIZE 8192
-#define JOURNAL_NUM_BITMAPS 5 /* number of copies of the bitmaps to have floating.  Must be >= 2 */
+#define JOURNAL_NUM_BITMAPS 5   /* number of copies of the bitmaps to have floating.  Must be >= 2 */
 /* One of these for every block in every transaction
 ** Each one is in two hash tables.  First, a hash of the current transaction, and after journal_end, a
@@ -117,27 +117,27 @@ typedef enum {
 ** to a given transaction.
 */
 struct reiserfs_journal_cnode {
-  struct buffer_head *bh ;               /* real buffer head */
+        struct buffer_head *bh; /* real buffer head */
-  struct super_block *sb ;               /* dev of real buffer head */
+        struct super_block *sb; /* dev of real buffer head */
-  __u32 blocknr ;                /* block number of real buffer head, == 0 when buffer on disk */
+        __u32 blocknr;          /* block number of real buffer head, == 0 when buffer on disk */
-  long state ;
+        long state;
-  struct reiserfs_journal_list *jlist ;  /* journal list this cnode lives in */
+        struct reiserfs_journal_list *jlist;    /* journal list this cnode lives in */
-  struct reiserfs_journal_cnode *next ;  /* next in transaction list */
+        struct reiserfs_journal_cnode *next;    /* next in transaction list */
-  struct reiserfs_journal_cnode *prev ;  /* prev in transaction list */
+        struct reiserfs_journal_cnode *prev;    /* prev in transaction list */
-  struct reiserfs_journal_cnode *hprev ; /* prev in hash list */
+        struct reiserfs_journal_cnode *hprev;   /* prev in hash list */
-  struct reiserfs_journal_cnode *hnext ; /* next in hash list */
+        struct reiserfs_journal_cnode *hnext;   /* next in hash list */
 };
 struct reiserfs_bitmap_node {
-  int id ;
+        int id;
-  char *data ;
+        char *data;
-  struct list_head list ;
+        struct list_head list;
-} ;
+};
 struct reiserfs_list_bitmap {
-  struct reiserfs_journal_list *journal_list ;
+        struct reiserfs_journal_list *journal_list;
-  struct reiserfs_bitmap_node **bitmaps ;
+        struct reiserfs_bitmap_node **bitmaps;
-} ;
+};
 /*
 ** one of these for each transaction.  The most important part here is the j_realblock.
@@ -146,273 +146,269 @@ struct reiserfs_list_bitmap {
 ** and to make sure every real block in a transaction is on disk before allowing the log area
 ** to be overwritten */
 struct reiserfs_journal_list {
-  unsigned long j_start ;
+        unsigned long j_start;
-  unsigned long j_state;
+        unsigned long j_state;
-  unsigned long j_len ;
+        unsigned long j_len;
-  atomic_t j_nonzerolen ;
+        atomic_t j_nonzerolen;
-  atomic_t j_commit_left ;
+        atomic_t j_commit_left;
-  atomic_t j_older_commits_done ;      /* all commits older than this on disk*/
+        atomic_t j_older_commits_done;  /* all commits older than this on disk */
-  struct semaphore j_commit_lock;
+        struct semaphore j_commit_lock;
-  unsigned long j_trans_id ;
+        unsigned long j_trans_id;
-  time_t j_timestamp ;
+        time_t j_timestamp;
-  struct reiserfs_list_bitmap *j_list_bitmap ;
+        struct reiserfs_list_bitmap *j_list_bitmap;
-  struct buffer_head *j_commit_bh ; /* commit buffer head */
+        struct buffer_head *j_commit_bh;        /* commit buffer head */
-  struct reiserfs_journal_cnode *j_realblock  ;
+        struct reiserfs_journal_cnode *j_realblock;
-  struct reiserfs_journal_cnode *j_freedlist ; /* list of buffers that were freed during this trans.  free each of these on flush */
+        struct reiserfs_journal_cnode *j_freedlist;     /* list of buffers that were freed during this trans.  free each of these on flush */
-  /* time ordered list of all active transactions */
+        /* time ordered list of all active transactions */
-  struct list_head j_list;
+        struct list_head j_list;
-  /* time ordered list of all transactions we haven't tried to flush yet */
+        /* time ordered list of all transactions we haven't tried to flush yet */
-  struct list_head j_working_list;
+        struct list_head j_working_list;
-  /* list of tail conversion targets in need of flush before commit */
+        /* list of tail conversion targets in need of flush before commit */
-  struct list_head j_tail_bh_list;
+        struct list_head j_tail_bh_list;
-  /* list of data=ordered buffers in need of flush before commit */
+        /* list of data=ordered buffers in need of flush before commit */
-  struct list_head j_bh_list;
+        struct list_head j_bh_list;
-  int j_refcount;
+        int j_refcount;
-} ;
+};
 struct reiserfs_journal {
-  struct buffer_head ** j_ap_blocks ; /* journal blocks on disk */
+        struct buffer_head **j_ap_blocks;       /* journal blocks on disk */
-  struct reiserfs_journal_cnode *j_last ; /* newest journal block */
+        struct reiserfs_journal_cnode *j_last;  /* newest journal block */
-  struct reiserfs_journal_cnode *j_first ; /*  oldest journal block.  start here for traverse */
+        struct reiserfs_journal_cnode *j_first; /*  oldest journal block.  start here for traverse */
-  struct file         *j_dev_file;
+        struct file *j_dev_file;
-  struct block_device *j_dev_bd;  
+        struct block_device *j_dev_bd;
-  int j_1st_reserved_block;     /* first block on s_dev of reserved area journal */        
+        int j_1st_reserved_block;       /* first block on s_dev of reserved area journal */
-        
-  long j_state ;                        
+        long j_state;
-  unsigned long j_trans_id ;
+        unsigned long j_trans_id;
-  unsigned long j_mount_id ;
+        unsigned long j_mount_id;
-  unsigned long j_start ;             /* start of current waiting commit (index into j_ap_blocks) */
+        unsigned long j_start;  /* start of current waiting commit (index into j_ap_blocks) */
-  unsigned long j_len ;               /* lenght of current waiting commit */
+        unsigned long j_len;    /* lenght of current waiting commit */
-  unsigned long j_len_alloc ;         /* number of buffers requested by journal_begin() */
+        unsigned long j_len_alloc;      /* number of buffers requested by journal_begin() */
-  atomic_t j_wcount ;            /* count of writers for current commit */
+        atomic_t j_wcount;      /* count of writers for current commit */
-  unsigned long j_bcount ;            /* batch count. allows turning X transactions into 1 */
+        unsigned long j_bcount; /* batch count. allows turning X transactions into 1 */
-  unsigned long j_first_unflushed_offset ;  /* first unflushed transactions offset */
+        unsigned long j_first_unflushed_offset; /* first unflushed transactions offset */
-  unsigned long j_last_flush_trans_id ;    /* last fully flushed journal timestamp */
+        unsigned long j_last_flush_trans_id;    /* last fully flushed journal timestamp */
-  struct buffer_head *j_header_bh ;   
+        struct buffer_head *j_header_bh;
-  time_t j_trans_start_time ;         /* time this transaction started */
+        time_t j_trans_start_time;      /* time this transaction started */
-  struct semaphore j_lock;
+        struct semaphore j_lock;
-  struct semaphore j_flush_sem;
+        struct semaphore j_flush_sem;
-  wait_queue_head_t j_join_wait ;    /* wait for current transaction to finish before starting new one */
+        wait_queue_head_t j_join_wait;  /* wait for current transaction to finish before starting new one */
-  atomic_t j_jlock ;                       /* lock for j_join_wait */
+        atomic_t j_jlock;       /* lock for j_join_wait */
-  int j_list_bitmap_index ;           /* number of next list bitmap to use */
+        int j_list_bitmap_index;        /* number of next list bitmap to use */
-  int j_must_wait ;                    /* no more journal begins allowed. MUST sleep on j_join_wait */
+        int j_must_wait;        /* no more journal begins allowed. MUST sleep on j_join_wait */
-  int j_next_full_flush ;             /* next journal_end will flush all journal list */
+        int j_next_full_flush;  /* next journal_end will flush all journal list */
-  int j_next_async_flush ;             /* next journal_end will flush all async commits */
+        int j_next_async_flush; /* next journal_end will flush all async commits */
-  int j_cnode_used ;          /* number of cnodes on the used list */
+        int j_cnode_used;       /* number of cnodes on the used list */
-  int j_cnode_free ;          /* number of cnodes on the free list */
+        int j_cnode_free;       /* number of cnodes on the free list */
-  unsigned int j_trans_max ;           /* max number of blocks in a transaction.  */
+        unsigned int j_trans_max;       /* max number of blocks in a transaction.  */
-  unsigned int j_max_batch ;           /* max number of blocks to batch into a trans */
+        unsigned int j_max_batch;       /* max number of blocks to batch into a trans */
-  unsigned int j_max_commit_age ;      /* in seconds, how old can an async commit be */
+        unsigned int j_max_commit_age;  /* in seconds, how old can an async commit be */
-  unsigned int j_max_trans_age ;       /* in seconds, how old can a transaction be */
+        unsigned int j_max_trans_age;   /* in seconds, how old can a transaction be */
-  unsigned int j_default_max_commit_age ; /* the default for the max commit age */
+        unsigned int j_default_max_commit_age;  /* the default for the max commit age */
-  struct reiserfs_journal_cnode *j_cnode_free_list ;
+        struct reiserfs_journal_cnode *j_cnode_free_list;
-  struct reiserfs_journal_cnode *j_cnode_free_orig ; /* orig pointer returned from vmalloc */
+        struct reiserfs_journal_cnode *j_cnode_free_orig;       /* orig pointer returned from vmalloc */
-  struct reiserfs_journal_list *j_current_jl;
+        struct reiserfs_journal_list *j_current_jl;
-  int j_free_bitmap_nodes ;
+        int j_free_bitmap_nodes;
-  int j_used_bitmap_nodes ;
+        int j_used_bitmap_nodes;
-  int j_num_lists;      /* total number of active transactions */
+        int j_num_lists;        /* total number of active transactions */
-  int j_num_work_lists; /* number that need attention from kreiserfsd */
+        int j_num_work_lists;   /* number that need attention from kreiserfsd */
-  /* debugging to make sure things are flushed in order */
+        /* debugging to make sure things are flushed in order */
-  int j_last_flush_id;
+        int j_last_flush_id;
-  /* debugging to make sure things are committed in order */
+        /* debugging to make sure things are committed in order */
-  int j_last_commit_id;
+        int j_last_commit_id;
-  struct list_head j_bitmap_nodes ;
+        struct list_head j_bitmap_nodes;
-  struct list_head j_dirty_buffers ;
+        struct list_head j_dirty_buffers;
-  spinlock_t j_dirty_buffers_lock ; /* protects j_dirty_buffers */
+        spinlock_t j_dirty_buffers_lock;        /* protects j_dirty_buffers */
-  /* list of all active transactions */
+        /* list of all active transactions */
-  struct list_head j_journal_list;
+        struct list_head j_journal_list;
-  /* lists that haven't been touched by writeback attempts */
+        /* lists that haven't been touched by writeback attempts */
-  struct list_head j_working_list;
+        struct list_head j_working_list;
-  struct reiserfs_list_bitmap j_list_bitmap[JOURNAL_NUM_BITMAPS] ;      /* array of bitmaps to record the deleted blocks */
+        struct reiserfs_list_bitmap j_list_bitmap[JOURNAL_NUM_BITMAPS]; /* array of bitmaps to record the deleted blocks */
-  struct reiserfs_journal_cnode *j_hash_table[JOURNAL_HASH_SIZE] ;          /* hash table for real buffer heads in current trans */ 
+        struct reiserfs_journal_cnode *j_hash_table[JOURNAL_HASH_SIZE]; /* hash table for real buffer heads in current trans */
-  struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE] ; /* hash table for all the real buffer heads in all 
+        struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE];    /* hash table for all the real buffer heads in all 
-                                                                                the transactions */
+                                                                                   the transactions */
-  struct list_head j_prealloc_list;     /* list of inodes which have preallocated blocks */
+        struct list_head j_prealloc_list;       /* list of inodes which have preallocated blocks */
-  int j_persistent_trans;
+        int j_persistent_trans;
-  unsigned long j_max_trans_size ;
+        unsigned long j_max_trans_size;
-  unsigned long j_max_batch_size ;
+        unsigned long j_max_batch_size;
-  int j_errno;
+        int j_errno;
-  /* when flushing ordered buffers, throttle new ordered writers */
+        /* when flushing ordered buffers, throttle new ordered writers */
-  struct work_struct j_work;
+        struct work_struct j_work;
-  atomic_t j_async_throttle;
+        atomic_t j_async_throttle;
 };
 enum journal_state_bits {
-    J_WRITERS_BLOCKED = 1,   /* set when new writers not allowed */
+        J_WRITERS_BLOCKED = 1,  /* set when new writers not allowed */
-    J_WRITERS_QUEUED,        /* set when log is full due to too many writers */
+        J_WRITERS_QUEUED,       /* set when log is full due to too many writers */
-    J_ABORTED,               /* set when log is aborted */
+        J_ABORTED,              /* set when log is aborted */
 };
+#define JOURNAL_DESC_MAGIC "ReIsErLB"   /* ick.  magic string to find desc blocks in the journal */
-#define JOURNAL_DESC_MAGIC "ReIsErLB" /* ick.  magic string to find desc blocks in the journal */
+typedef __u32(*hashf_t) (const signed char *, int);
-typedef __u32 (*hashf_t) (const signed char *, int);
+struct reiserfs_bitmap_info {
+        // FIXME: Won't work with block sizes > 8K
-struct reiserfs_bitmap_info
+        __u16 first_zero_hint;
-{
+        __u16 free_count;
-    // FIXME: Won't work with block sizes > 8K
+        struct buffer_head *bh; /* the actual bitmap */
-    __u16  first_zero_hint;
-    __u16  free_count;
-    struct buffer_head *bh; /* the actual bitmap */
 };
 struct proc_dir_entry;
 #if defined( CONFIG_PROC_FS ) && defined( CONFIG_REISERFS_PROC_INFO )
 typedef unsigned long int stat_cnt_t;
-typedef struct reiserfs_proc_info_data
+typedef struct reiserfs_proc_info_data {
-{
+        spinlock_t lock;
-  spinlock_t lock;
+        int exiting;
-  int exiting;
+        int max_hash_collisions;
-  int max_hash_collisions;
+        stat_cnt_t breads;
-  stat_cnt_t breads;
+        stat_cnt_t bread_miss;
-  stat_cnt_t bread_miss;
+        stat_cnt_t search_by_key;
-  stat_cnt_t search_by_key;
+        stat_cnt_t search_by_key_fs_changed;
-  stat_cnt_t search_by_key_fs_changed;
+        stat_cnt_t search_by_key_restarted;
-  stat_cnt_t search_by_key_restarted;
+        stat_cnt_t insert_item_restarted;
-  stat_cnt_t insert_item_restarted;
+        stat_cnt_t paste_into_item_restarted;
-  stat_cnt_t paste_into_item_restarted;
+        stat_cnt_t cut_from_item_restarted;
-  stat_cnt_t cut_from_item_restarted;
+        stat_cnt_t delete_solid_item_restarted;
-  stat_cnt_t delete_solid_item_restarted;
+        stat_cnt_t delete_item_restarted;
-  stat_cnt_t delete_item_restarted;
+        stat_cnt_t leaked_oid;
-  stat_cnt_t leaked_oid;
+        stat_cnt_t leaves_removable;
-  stat_cnt_t leaves_removable;
+        /* balances per level. Use explicit 5 as MAX_HEIGHT is not visible yet. */
-  /* balances per level. Use explicit 5 as MAX_HEIGHT is not visible yet. */
+        stat_cnt_t balance_at[5];       /* XXX */
-  stat_cnt_t balance_at[ 5 ]; /* XXX */
+        /* sbk == search_by_key */
-  /* sbk == search_by_key */
+        stat_cnt_t sbk_read_at[5];      /* XXX */
-  stat_cnt_t sbk_read_at[ 5 ]; /* XXX */
+        stat_cnt_t sbk_fs_changed[5];
-  stat_cnt_t sbk_fs_changed[ 5 ];
+        stat_cnt_t sbk_restarted[5];
-  stat_cnt_t sbk_restarted[ 5 ];
+        stat_cnt_t items_at[5]; /* XXX */
-  stat_cnt_t items_at[ 5 ]; /* XXX */
+        stat_cnt_t free_at[5];  /* XXX */
-  stat_cnt_t free_at[ 5 ]; /* XXX */
+        stat_cnt_t can_node_be_removed[5];      /* XXX */
-  stat_cnt_t can_node_be_removed[ 5 ]; /* XXX */
+        long int lnum[5];       /* XXX */
-  long int lnum[ 5 ]; /* XXX */
+        long int rnum[5];       /* XXX */
-  long int rnum[ 5 ]; /* XXX */
+        long int lbytes[5];     /* XXX */
-  long int lbytes[ 5 ]; /* XXX */
+        long int rbytes[5];     /* XXX */
-  long int rbytes[ 5 ]; /* XXX */
+        stat_cnt_t get_neighbors[5];
-  stat_cnt_t get_neighbors[ 5 ];
+        stat_cnt_t get_neighbors_restart[5];
-  stat_cnt_t get_neighbors_restart[ 5 ];
+        stat_cnt_t need_l_neighbor[5];
-  stat_cnt_t need_l_neighbor[ 5 ];
+        stat_cnt_t need_r_neighbor[5];
-  stat_cnt_t need_r_neighbor[ 5 ];
+        stat_cnt_t free_block;
-  stat_cnt_t free_block;
+        struct __scan_bitmap_stats {
-  struct __scan_bitmap_stats {
+                stat_cnt_t call;
-        stat_cnt_t call;
+                stat_cnt_t wait;
-        stat_cnt_t wait;
+                stat_cnt_t bmap;
-        stat_cnt_t bmap;
+                stat_cnt_t retry;
-        stat_cnt_t retry;
+                stat_cnt_t in_journal_hint;
-        stat_cnt_t in_journal_hint;
+                stat_cnt_t in_journal_nohint;
-        stat_cnt_t in_journal_nohint;
+                stat_cnt_t stolen;
-        stat_cnt_t stolen;
+        } scan_bitmap;
-  } scan_bitmap;
+        struct __journal_stats {
-  struct __journal_stats {
+                stat_cnt_t in_journal;
-        stat_cnt_t in_journal;
+                stat_cnt_t in_journal_bitmap;
-        stat_cnt_t in_journal_bitmap;
+                stat_cnt_t in_journal_reusable;
-        stat_cnt_t in_journal_reusable;
+                stat_cnt_t lock_journal;
-        stat_cnt_t lock_journal;
+                stat_cnt_t lock_journal_wait;
-        stat_cnt_t lock_journal_wait;
+                stat_cnt_t journal_being;
-        stat_cnt_t journal_being;
+                stat_cnt_t journal_relock_writers;
-        stat_cnt_t journal_relock_writers;
+                stat_cnt_t journal_relock_wcount;
-        stat_cnt_t journal_relock_wcount;
+                stat_cnt_t mark_dirty;
-        stat_cnt_t mark_dirty;
+                stat_cnt_t mark_dirty_already;
-        stat_cnt_t mark_dirty_already;
+                stat_cnt_t mark_dirty_notjournal;
-        stat_cnt_t mark_dirty_notjournal;
+                stat_cnt_t restore_prepared;
-        stat_cnt_t restore_prepared;
+                stat_cnt_t prepare;
-        stat_cnt_t prepare;
+                stat_cnt_t prepare_retry;
-        stat_cnt_t prepare_retry;
+        } journal;
-  } journal;
 } reiserfs_proc_info_data_t;
 #else
-typedef struct reiserfs_proc_info_data
+typedef struct reiserfs_proc_info_data {
-{} reiserfs_proc_info_data_t;
+} reiserfs_proc_info_data_t;
 #endif
 /* reiserfs union of in-core super block data */
-struct reiserfs_sb_info
+struct reiserfs_sb_info {
-{
+        struct buffer_head *s_sbh;      /* Buffer containing the super block */
-    struct buffer_head * s_sbh;                   /* Buffer containing the super block */
+        /* both the comment and the choice of
-                                /* both the comment and the choice of
+           name are unclear for s_rs -Hans */
-                                   name are unclear for s_rs -Hans */
+        struct reiserfs_super_block *s_rs;      /* Pointer to the super block in the buffer */
-    struct reiserfs_super_block * s_rs;           /* Pointer to the super block in the buffer */
+        struct reiserfs_bitmap_info *s_ap_bitmap;
-    struct reiserfs_bitmap_info * s_ap_bitmap;
+        struct reiserfs_journal *s_journal;     /* pointer to journal information */
-    struct reiserfs_journal *s_journal ;                /* pointer to journal information */
+        unsigned short s_mount_state;   /* reiserfs state (valid, invalid) */
-    unsigned short s_mount_state;                 /* reiserfs state (valid, invalid) */
-  
+        /* Comment? -Hans */
-                                /* Comment? -Hans */
+        void (*end_io_handler) (struct buffer_head *, int);
-    void (*end_io_handler)(struct buffer_head *, int);
+        hashf_t s_hash_function;        /* pointer to function which is used
-    hashf_t s_hash_function;    /* pointer to function which is used
+                                           to sort names in directory. Set on
-                                   to sort names in directory. Set on
+                                           mount */
-                                   mount */
+        unsigned long s_mount_opt;      /* reiserfs's mount options are set
-    unsigned long s_mount_opt;  /* reiserfs's mount options are set
+                                           here (currently - NOTAIL, NOLOG,
-                                   here (currently - NOTAIL, NOLOG,
+                                           REPLAYONLY) */
-                                   REPLAYONLY) */
+        struct {                /* This is a structure that describes block allocator options */
-    struct {                    /* This is a structure that describes block allocator options */
+                unsigned long bits;     /* Bitfield for enable/disable kind of options */
-        unsigned long bits;     /* Bitfield for enable/disable kind of options */
+                unsigned long large_file_size;  /* size started from which we consider file to be a large one(in blocks) */
-        unsigned long large_file_size; /* size started from which we consider file to be a large one(in blocks) */
+                int border;     /* percentage of disk, border takes */
-        int border;             /* percentage of disk, border takes */
+                int preallocmin;        /* Minimal file size (in blocks) starting from which we do preallocations */
-        int preallocmin;        /* Minimal file size (in blocks) starting from which we do preallocations */
+                int preallocsize;       /* Number of blocks we try to prealloc when file
-        int preallocsize;       /* Number of blocks we try to prealloc when file
+                                           reaches preallocmin size (in blocks) or
-                                   reaches preallocmin size (in blocks) or
+                                           prealloc_list is empty. */
-                                   prealloc_list is empty. */
+        } s_alloc_options;
-    } s_alloc_options;
+        /* Comment? -Hans */
-                                /* Comment? -Hans */
+        wait_queue_head_t s_wait;
-    wait_queue_head_t s_wait;
+        /* To be obsoleted soon by per buffer seals.. -Hans */
-                                /* To be obsoleted soon by per buffer seals.. -Hans */
+        atomic_t s_generation_counter;  // increased by one every time the
-    atomic_t s_generation_counter; // increased by one every time the
+        // tree gets re-balanced
-    // tree gets re-balanced
+        unsigned long s_properties;     /* File system properties. Currently holds
-    unsigned long s_properties;    /* File system properties. Currently holds
+                                           on-disk FS format */
-                                     on-disk FS format */
-    
+        /* session statistics */
-    /* session statistics */
+        int s_kmallocs;
-    int s_kmallocs;
+        int s_disk_reads;
-    int s_disk_reads;
+        int s_disk_writes;
-    int s_disk_writes;
+        int s_fix_nodes;
-    int s_fix_nodes;
+        int s_do_balance;
-    int s_do_balance;
+        int s_unneeded_left_neighbor;
-    int s_unneeded_left_neighbor;
+        int s_good_search_by_key_reada;
-    int s_good_search_by_key_reada;
+        int s_bmaps;
-    int s_bmaps;
+        int s_bmaps_without_search;
-    int s_bmaps_without_search;
+        int s_direct2indirect;
-    int s_direct2indirect;
+        int s_indirect2direct;
-    int s_indirect2direct;
        /* set up when it's ok for reiserfs_read_inode2() to read from
           disk inode with nlink==0. Currently this is only used during
           finish_unfinished() processing at mount time */
-    int s_is_unlinked_ok;
+        int s_is_unlinked_ok;
-    reiserfs_proc_info_data_t s_proc_info_data;
+        reiserfs_proc_info_data_t s_proc_info_data;
-    struct proc_dir_entry *procdir;
+        struct proc_dir_entry *procdir;
-    int reserved_blocks; /* amount of blocks reserved for further allocations */
+        int reserved_blocks;    /* amount of blocks reserved for further allocations */
-    spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */
+        spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */
-    struct dentry *priv_root; /* root of /.reiserfs_priv */
+        struct dentry *priv_root;       /* root of /.reiserfs_priv */
-    struct dentry *xattr_root; /* root of /.reiserfs_priv/.xa */
+        struct dentry *xattr_root;      /* root of /.reiserfs_priv/.xa */
-    struct rw_semaphore xattr_dir_sem;
+        struct rw_semaphore xattr_dir_sem;
-    int j_errno;
+        int j_errno;
 #ifdef CONFIG_QUOTA
-    char *s_qf_names[MAXQUOTAS];
+        char *s_qf_names[MAXQUOTAS];
-    int s_jquota_fmt;
+        int s_jquota_fmt;
 #endif
 };
@@ -422,14 +418,14 @@ struct reiserfs_sb_info
 enum reiserfs_mount_options {
 /* Mount options */
-    REISERFS_LARGETAIL,  /* large tails will be created in a session */
+        REISERFS_LARGETAIL,     /* large tails will be created in a session */
-    REISERFS_SMALLTAIL,  /* small (for files less than block size) tails will be created in a session */
+        REISERFS_SMALLTAIL,     /* small (for files less than block size) tails will be created in a session */
-    REPLAYONLY, /* replay journal and return 0. Use by fsck */
+        REPLAYONLY,             /* replay journal and return 0. Use by fsck */
-    REISERFS_CONVERT,    /* -o conv: causes conversion of old
+        REISERFS_CONVERT,       /* -o conv: causes conversion of old
-                                 format super block to the new
+                                   format super block to the new
-                                 format. If not specified - old
+                                   format. If not specified - old
-                                 partition will be dealt with in a
+                                   partition will be dealt with in a
-                                 manner of 3.5.x */
+                                   manner of 3.5.x */
 /* -o hash={tea, rupasov, r5, detect} is meant for properly mounting 
 ** reiserfs disks from 3.5.19 or earlier.  99% of the time, this option
@@ -439,41 +435,41 @@ enum reiserfs_mount_options {
 ** the existing hash on the FS, so if you have a tea hash disk, and mount
 ** with -o hash=rupasov, the mount will fail.
 */
-    FORCE_TEA_HASH,      /* try to force tea hash on mount */
+        FORCE_TEA_HASH,         /* try to force tea hash on mount */
-    FORCE_RUPASOV_HASH,  /* try to force rupasov hash on mount */
+        FORCE_RUPASOV_HASH,     /* try to force rupasov hash on mount */
-    FORCE_R5_HASH,       /* try to force rupasov hash on mount */
+        FORCE_R5_HASH,          /* try to force rupasov hash on mount */
-    FORCE_HASH_DETECT,   /* try to detect hash function on mount */
+        FORCE_HASH_DETECT,      /* try to detect hash function on mount */
-    REISERFS_DATA_LOG,
+        REISERFS_DATA_LOG,
-    REISERFS_DATA_ORDERED,
+        REISERFS_DATA_ORDERED,
-    REISERFS_DATA_WRITEBACK,
+        REISERFS_DATA_WRITEBACK,
 /* used for testing experimental features, makes benchmarking new
   features with and without more convenient, should never be used by
   users in any code shipped to users (ideally) */
-    REISERFS_NO_BORDER,
+        REISERFS_NO_BORDER,
-    REISERFS_NO_UNHASHED_RELOCATION,
+        REISERFS_NO_UNHASHED_RELOCATION,
-    REISERFS_HASHED_RELOCATION,
+        REISERFS_HASHED_RELOCATION,
-    REISERFS_ATTRS,
+        REISERFS_ATTRS,
-    REISERFS_XATTRS,
+        REISERFS_XATTRS,
-    REISERFS_XATTRS_USER,
+        REISERFS_XATTRS_USER,
-    REISERFS_POSIXACL,
+        REISERFS_POSIXACL,
-    REISERFS_BARRIER_NONE,
+        REISERFS_BARRIER_NONE,
-    REISERFS_BARRIER_FLUSH,
+        REISERFS_BARRIER_FLUSH,
-    /* Actions on error */
+        /* Actions on error */
-    REISERFS_ERROR_PANIC,
+        REISERFS_ERROR_PANIC,
-    REISERFS_ERROR_RO,
+        REISERFS_ERROR_RO,
-    REISERFS_ERROR_CONTINUE,
+        REISERFS_ERROR_CONTINUE,
-    REISERFS_QUOTA,             /* Some quota option specified */
+        REISERFS_QUOTA,         /* Some quota option specified */
-    REISERFS_TEST1,
+        REISERFS_TEST1,
-    REISERFS_TEST2,
+        REISERFS_TEST2,
-    REISERFS_TEST3,
+        REISERFS_TEST3,
-    REISERFS_TEST4,
+        REISERFS_TEST4,
-    REISERFS_UNSUPPORTED_OPT,
+        REISERFS_UNSUPPORTED_OPT,
 };
 #define reiserfs_r5_hash(s) (REISERFS_SB(s)->s_mount_opt & (1 << FORCE_R5_HASH))
@@ -504,18 +500,17 @@ enum reiserfs_mount_options {
 #define reiserfs_error_panic(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ERROR_PANIC))
 #define reiserfs_error_ro(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ERROR_RO))
-void reiserfs_file_buffer (struct buffer_head * bh, int list);
+void reiserfs_file_buffer(struct buffer_head *bh, int list);
 extern struct file_system_type reiserfs_fs_type;
-int reiserfs_resize(struct super_block *, unsigned long) ;
+int reiserfs_resize(struct super_block *, unsigned long);
 #define CARRY_ON                0
 #define SCHEDULE_OCCURRED       1
 #define SB_BUFFER_WITH_SB(s) (REISERFS_SB(s)->s_sbh)
 #define SB_JOURNAL(s) (REISERFS_SB(s)->s_journal)
 #define SB_JOURNAL_1st_RESERVED_BLOCK(s) (SB_JOURNAL(s)->j_1st_reserved_block)
-#define SB_JOURNAL_LEN_FREE(s) (SB_JOURNAL(s)->j_journal_len_free) 
+#define SB_JOURNAL_LEN_FREE(s) (SB_JOURNAL(s)->j_journal_len_free)
 #define SB_AP_BITMAP(s) (REISERFS_SB(s)->s_ap_bitmap)
 #define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)->j_header_bh->)
@@ -525,13 +520,14 @@ int reiserfs_resize(struct super_block *, unsigned long) ;
 */
 static inline char *reiserfs_bdevname(struct super_block *s)
 {
-        return (s == NULL) ? "Null superblock" : s -> s_id;
+        return (s == NULL) ? "Null superblock" : s->s_id;
 }
 #define reiserfs_is_journal_aborted(journal) (unlikely (__reiserfs_is_journal_aborted (journal)))
-static inline int __reiserfs_is_journal_aborted (struct reiserfs_journal *journal)
+static inline int __reiserfs_is_journal_aborted(struct reiserfs_journal
+                                                *journal)
 {
-    return test_bit (J_ABORTED, &journal->j_state);
+        return test_bit(J_ABORTED, &journal->j_state);
 }
-#endif  /* _LINUX_REISER_FS_SB */
+#endif                          /* _LINUX_REISER_FS_SB */
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index 9244c5748820..c84354e8374c 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -7,48 +7,48 @@
 #include <linux/xattr.h>
 /* Magic value in header */
-#define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */
+#define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */
 struct reiserfs_xattr_header {
-    __le32 h_magic;              /* magic number for identification */
+        __le32 h_magic;         /* magic number for identification */
-    __le32 h_hash;               /* hash of the value */
+        __le32 h_hash;          /* hash of the value */
 };
 #ifdef __KERNEL__
 struct reiserfs_xattr_handler {
        char *prefix;
-        int (*init)(void);
+        int (*init) (void);
-        void (*exit)(void);
+        void (*exit) (void);
-        int (*get)(struct inode *inode, const char *name, void *buffer,
+        int (*get) (struct inode * inode, const char *name, void *buffer,
-                   size_t size);
+                    size_t size);
-        int (*set)(struct inode *inode, const char *name, const void *buffer,
+        int (*set) (struct inode * inode, const char *name, const void *buffer,
-                   size_t size, int flags);
+                    size_t size, int flags);
-        int (*del)(struct inode *inode, const char *name);
+        int (*del) (struct inode * inode, const char *name);
-        int (*list)(struct inode *inode, const char *name, int namelen, char *out);
+        int (*list) (struct inode * inode, const char *name, int namelen,
-        struct list_head handlers;
+                     char *out);
+        struct list_head handlers;
 };
 #ifdef CONFIG_REISERFS_FS_XATTR
 #define is_reiserfs_priv_object(inode) IS_PRIVATE(inode)
 #define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
-ssize_t reiserfs_getxattr (struct dentry *dentry, const char *name,
+ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
-                           void *buffer, size_t size);
+                          void *buffer, size_t size);
-int reiserfs_setxattr (struct dentry *dentry, const char *name,
+int reiserfs_setxattr(struct dentry *dentry, const char *name,
-                       const void *value, size_t size, int flags);
+                      const void *value, size_t size, int flags);
-ssize_t reiserfs_listxattr (struct dentry *dentry, char *buffer, size_t size);
+ssize_t reiserfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
-int reiserfs_removexattr (struct dentry *dentry, const char *name);
+int reiserfs_removexattr(struct dentry *dentry, const char *name);
-int reiserfs_delete_xattrs (struct inode *inode);
+int reiserfs_delete_xattrs(struct inode *inode);
-int reiserfs_chown_xattrs (struct inode *inode, struct iattr *attrs);
+int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);
-int reiserfs_xattr_init (struct super_block *sb, int mount_flags);
+int reiserfs_xattr_init(struct super_block *sb, int mount_flags);
-int reiserfs_permission (struct inode *inode, int mask, struct nameidata *nd);
+int reiserfs_permission(struct inode *inode, int mask, struct nameidata *nd);
-int reiserfs_permission_locked (struct inode *inode, int mask, struct nameidata *nd);
+int reiserfs_permission_locked(struct inode *inode, int mask,
+                               struct nameidata *nd);
-int reiserfs_xattr_del (struct inode *, const char *);
-int reiserfs_xattr_get (const struct inode *, const char *, void *, size_t);
+int reiserfs_xattr_del(struct inode *, const char *);
-int reiserfs_xattr_set (struct inode *, const char *, const void *,
+int reiserfs_xattr_get(const struct inode *, const char *, void *, size_t);
-                               size_t, int);
+int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int);
 extern struct reiserfs_xattr_handler user_handler;
 extern struct reiserfs_xattr_handler trusted_handler;
@@ -56,57 +56,48 @@ extern struct reiserfs_xattr_handler trusted_handler;
 extern struct reiserfs_xattr_handler security_handler;
 #endif
-int reiserfs_xattr_register_handlers (void) __init;
+int reiserfs_xattr_register_handlers(void) __init;
-void reiserfs_xattr_unregister_handlers (void);
+void reiserfs_xattr_unregister_handlers(void);
-static inline void
+static inline void reiserfs_write_lock_xattrs(struct super_block *sb)
-reiserfs_write_lock_xattrs(struct super_block *sb)
 {
-    down_write (&REISERFS_XATTR_DIR_SEM(sb));
+        down_write(&REISERFS_XATTR_DIR_SEM(sb));
 }
-static inline void
+static inline void reiserfs_write_unlock_xattrs(struct super_block *sb)
-reiserfs_write_unlock_xattrs(struct super_block *sb)
 {
-    up_write (&REISERFS_XATTR_DIR_SEM(sb));
+        up_write(&REISERFS_XATTR_DIR_SEM(sb));
 }
-static inline void
+static inline void reiserfs_read_lock_xattrs(struct super_block *sb)
-reiserfs_read_lock_xattrs(struct super_block *sb)
 {
-    down_read (&REISERFS_XATTR_DIR_SEM(sb));
+        down_read(&REISERFS_XATTR_DIR_SEM(sb));
 }
-static inline void
+static inline void reiserfs_read_unlock_xattrs(struct super_block *sb)
-reiserfs_read_unlock_xattrs(struct super_block *sb)
 {
-    up_read (&REISERFS_XATTR_DIR_SEM(sb));
+        up_read(&REISERFS_XATTR_DIR_SEM(sb));
 }
-static inline void
+static inline void reiserfs_write_lock_xattr_i(struct inode *inode)
-reiserfs_write_lock_xattr_i(struct inode *inode)
 {
-    down_write (&REISERFS_I(inode)->xattr_sem);
+        down_write(&REISERFS_I(inode)->xattr_sem);
 }
-static inline void
+static inline void reiserfs_write_unlock_xattr_i(struct inode *inode)
-reiserfs_write_unlock_xattr_i(struct inode *inode)
 {
-    up_write (&REISERFS_I(inode)->xattr_sem);
+        up_write(&REISERFS_I(inode)->xattr_sem);
 }
-static inline void
+static inline void reiserfs_read_lock_xattr_i(struct inode *inode)
-reiserfs_read_lock_xattr_i(struct inode *inode)
 {
-    down_read (&REISERFS_I(inode)->xattr_sem);
+        down_read(&REISERFS_I(inode)->xattr_sem);
 }
-static inline void
+static inline void reiserfs_read_unlock_xattr_i(struct inode *inode)
-reiserfs_read_unlock_xattr_i(struct inode *inode)
 {
-    up_read (&REISERFS_I(inode)->xattr_sem);
+        up_read(&REISERFS_I(inode)->xattr_sem);
 }
-static inline void
+static inline void reiserfs_mark_inode_private(struct inode *inode)
-reiserfs_mark_inode_private(struct inode *inode)
 {
-    inode->i_flags |= S_PRIVATE;
+        inode->i_flags |= S_PRIVATE;
 }
 #else
@@ -127,13 +118,20 @@ reiserfs_mark_inode_private(struct inode *inode)
 #define reiserfs_xattr_register_handlers() 0
 #define reiserfs_xattr_unregister_handlers()
-static inline int reiserfs_delete_xattrs (struct inode *inode) { return 0; };
+static inline int reiserfs_delete_xattrs(struct inode *inode)
-static inline int reiserfs_chown_xattrs (struct inode *inode, struct iattr *attrs) { return 0; };
+{
-static inline int reiserfs_xattr_init (struct super_block *sb, int mount_flags)
+        return 0;
+};
+static inline int reiserfs_chown_xattrs(struct inode *inode,
+                                        struct iattr *attrs)
+{
+        return 0;
+};
+static inline int reiserfs_xattr_init(struct super_block *sb, int mount_flags)
 {
-    sb->s_flags = (sb->s_flags & ~MS_POSIXACL); /* to be sure */
+        sb->s_flags = (sb->s_flags & ~MS_POSIXACL);     /* to be sure */
-    return 0;
+        return 0;
 };
 #endif
-#endif  /* __KERNEL__ */
+#endif                          /* __KERNEL__ */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 657c05ab8f9e..c231e9a08f0b 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -826,9 +826,8 @@ enum
 #define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))
 #define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
+#ifndef __KERNEL__
-/* RTnetlink multicast groups */
+/* RTnetlink multicast groups - backwards compatibility for userspace */
 #define RTMGRP_LINK             1
 #define RTMGRP_NOTIFY           2
 #define RTMGRP_NEIGH            4
@@ -847,6 +846,43 @@ enum
 #define RTMGRP_DECnet_ROUTE     0x4000
 #define RTMGRP_IPV6_PREFIX      0x20000
+#endif
+/* RTnetlink multicast groups */
+enum rtnetlink_groups {
+        RTNLGRP_NONE,
+#define RTNLGRP_NONE            RTNLGRP_NONE
+        RTNLGRP_LINK,
+#define RTNLGRP_LINK            RTNLGRP_LINK
+        RTNLGRP_NOTIFY,
+#define RTNLGRP_NOTIFY          RTNLGRP_NOTIFY
+        RTNLGRP_NEIGH,
+#define RTNLGRP_NEIGH           RTNLGRP_NEIGH
+        RTNLGRP_TC,
+#define RTNLGRP_TC              RTNLGRP_TC
+        RTNLGRP_IPV4_IFADDR,
+#define RTNLGRP_IPV4_IFADDR     RTNLGRP_IPV4_IFADDR
+        RTNLGRP_IPV4_MROUTE,
+#define RTNLGRP_IPV4_MROUTE     RTNLGRP_IPV4_MROUTE
+        RTNLGRP_IPV4_ROUTE,
+#define RTNLGRP_IPV4_ROUTE      RTNLGRP_IPV4_ROUTE
+        RTNLGRP_IPV6_IFADDR,
+#define RTNLGRP_IPV6_IFADDR     RTNLGRP_IPV6_IFADDR
+        RTNLGRP_IPV6_MROUTE,
+#define RTNLGRP_IPV6_MROUTE     RTNLGRP_IPV6_MROUTE
+        RTNLGRP_IPV6_ROUTE,
+#define RTNLGRP_IPV6_ROUTE      RTNLGRP_IPV6_ROUTE
+        RTNLGRP_IPV6_IFINFO,
+#define RTNLGRP_IPV6_IFINFO     RTNLGRP_IPV6_IFINFO
+        RTNLGRP_DECnet_IFADDR,
+#define RTNLGRP_DECnet_IFADDR   RTNLGRP_DECnet_IFADDR
+        RTNLGRP_DECnet_ROUTE,
+#define RTNLGRP_DECnet_ROUTE    RTNLGRP_DECnet_ROUTE
+        RTNLGRP_IPV6_PREFIX,
+#define RTNLGRP_IPV6_PREFIX     RTNLGRP_IPV6_PREFIX
+        __RTNLGRP_MAX
+};
+#define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
 /* TC action piece */
 struct tcamsg
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ff48815bd3a2..dec5827c7742 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -410,6 +410,10 @@ struct user_struct {
        atomic_t processes;     /* How many processes does this user have? */
        atomic_t files;         /* How many open files does this user have? */
        atomic_t sigpending;    /* How many pending signals does this user have? */
+#ifdef CONFIG_INOTIFY
+        atomic_t inotify_watches; /* How many inotify watches does this user have? */
+        atomic_t inotify_devs;  /* How many inotify devs does this user have opened? */
+#endif
        /* protected by mq_lock */
        unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */
        unsigned long locked_shm; /* How many pages of mlocked shm ? */
diff --git a/include/linux/security.h b/include/linux/security.h
index b42095a68b1c..7aab6ab7c57f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2727,7 +2727,8 @@ static inline int security_socket_getpeersec(struct socket *sock, char __user *o
        return security_ops->socket_getpeersec(sock, optval, optlen, len);
 }
-static inline int security_sk_alloc(struct sock *sk, int family, int priority)
+static inline int security_sk_alloc(struct sock *sk, int family,
+                                    unsigned int __nocast priority)
 {
        return security_ops->sk_alloc_security(sk, family, priority);
 }
@@ -2844,7 +2845,8 @@ static inline int security_socket_getpeersec(struct socket *sock, char __user *o
        return -ENOPROTOOPT;
 }
-static inline int security_sk_alloc(struct sock *sk, int family, int priority)
+static inline int security_sk_alloc(struct sock *sk, int family,
+                                    unsigned int __nocast priority)
 {
        return 0;
 }
diff --git a/include/linux/selinux_netlink.h b/include/linux/selinux_netlink.h
index 957e6ebca4e6..bbf489decd84 100644
--- a/include/linux/selinux_netlink.h
+++ b/include/linux/selinux_netlink.h
@@ -20,10 +20,21 @@ enum {
        SELNL_MSG_MAX
 };
-/* Multicast groups */
+#ifndef __KERNEL__
+/* Multicast groups - backwards compatiblility for userspace */
 #define SELNL_GRP_NONE          0x00000000
 #define SELNL_GRP_AVC           0x00000001      /* AVC notifications */
 #define SELNL_GRP_ALL           0xffffffff
+#endif
+enum selinux_nlgroups {
+        SELNLGRP_NONE,
+#define SELNLGRP_NONE   SELNLGRP_NONE
+        SELNLGRP_AVC,
+#define SELNLGRP_AVC    SELNLGRP_AVC
+        __SELNLGRP_MAX
+};
+#define SELNLGRP_MAX    (__SELNLGRP_MAX - 1)
 /* Message structures */
 struct selnl_msg_setenforce {
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 00145822fb74..12cd9cf65e8f 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -174,9 +174,7 @@ struct serial_icounter_struct {
 #ifdef __KERNEL__
-/* Export to allow PCMCIA to use this - Dave Hinds */
+#include <linux/compiler.h>
-extern int register_serial(struct serial_struct *req);
-extern void unregister_serial(int line);
 /* Allow architectures to override entries in serial8250_ports[] at run time: */
 struct uart_port;       /* forward declaration */
diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index 2307f11d8a6b..2b9e6b9554d5 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -19,7 +19,6 @@
 * For definitions of the flags field, see tty.h
 */
-#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/termios.h>
 #include <linux/workqueue.h>
@@ -141,44 +140,4 @@ struct rs_multiport_struct {
 #define ALPHA_KLUDGE_MCR 0
 #endif
-/*
- * Definitions for PCI support.
- */
-#define SPCI_FL_BASE_MASK       0x0007
-#define SPCI_FL_BASE0   0x0000
-#define SPCI_FL_BASE1   0x0001
-#define SPCI_FL_BASE2   0x0002
-#define SPCI_FL_BASE3   0x0003
-#define SPCI_FL_BASE4   0x0004
-#define SPCI_FL_GET_BASE(x)     (x & SPCI_FL_BASE_MASK)
-#define SPCI_FL_IRQ_MASK       (0x0007 << 4)
-#define SPCI_FL_IRQBASE0       (0x0000 << 4)
-#define SPCI_FL_IRQBASE1       (0x0001 << 4)
-#define SPCI_FL_IRQBASE2       (0x0002 << 4)
-#define SPCI_FL_IRQBASE3       (0x0003 << 4)
-#define SPCI_FL_IRQBASE4       (0x0004 << 4)
-#define SPCI_FL_GET_IRQBASE(x)        ((x & SPCI_FL_IRQ_MASK) >> 4)
-/* Use successive BARs (PCI base address registers), 
-   else use offset into some specified BAR */
-#define SPCI_FL_BASE_TABLE      0x0100
-/* Use successive entries in the irq resource table */
-#define SPCI_FL_IRQ_TABLE       0x0200
-/* Use the irq resource table instead of dev->irq */
-#define SPCI_FL_IRQRESOURCE     0x0400
-/* Use the Base address register size to cap number of ports */
-#define SPCI_FL_REGION_SZ_CAP   0x0800
-/* Do not use irq sharing for this device */
-#define SPCI_FL_NO_SHIRQ        0x1000
-/* This is a PNP device */
-#define SPCI_FL_ISPNP           0x2000
-#define SPCI_FL_PNPDEFAULT      (SPCI_FL_IRQRESOURCE|SPCI_FL_ISPNP)
 #endif /* _LINUX_SERIAL_H */
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 3e3c1fa35b06..d8a023d804d4 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -14,6 +14,9 @@
 #include <linux/serial_core.h>
 #include <linux/device.h>
+/*
+ * This is the platform device platform_data structure
+ */
 struct plat_serial8250_port {
        unsigned long   iobase;         /* io base address */
        void __iomem    *membase;       /* ioremap cookie or NULL */
@@ -26,4 +29,17 @@ struct plat_serial8250_port {
        unsigned int    flags;          /* UPF_* flags */
 };
+/*
+ * This should be used by drivers which want to register
+ * their own 8250 ports without registering their own
+ * platform device.  Using these will make your driver
+ * dependent on the 8250 driver.
+ */
+struct uart_port;
+int serial8250_register_port(struct uart_port *);
+void serial8250_unregister_port(int line);
+void serial8250_suspend_port(int line);
+void serial8250_resume_port(int line);
 #endif
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index d6025af7efac..cf0f64ea2bc0 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -104,7 +104,7 @@
 #define PORT_MPSC       63
 /* TXX9 type number */
-#define PORT_TXX9       64
+#define PORT_TXX9       64
 /* NEC VR4100 series SIU/DSIU */
 #define PORT_VR41XX_SIU         65
@@ -122,6 +122,7 @@
 #ifdef __KERNEL__
 #include <linux/config.h>
+#include <linux/compiler.h>
 #include <linux/interrupt.h>
 #include <linux/circ_buf.h>
 #include <linux/spinlock.h>
@@ -141,8 +142,8 @@ struct uart_ops {
        unsigned int    (*tx_empty)(struct uart_port *);
        void            (*set_mctrl)(struct uart_port *, unsigned int mctrl);
        unsigned int    (*get_mctrl)(struct uart_port *);
-        void            (*stop_tx)(struct uart_port *, unsigned int tty_stop);
+        void            (*stop_tx)(struct uart_port *);
-        void            (*start_tx)(struct uart_port *, unsigned int tty_start);
+        void            (*start_tx)(struct uart_port *);
        void            (*send_xchar)(struct uart_port *, char ch);
        void            (*stop_rx)(struct uart_port *);
        void            (*enable_ms)(struct uart_port *);
@@ -359,8 +360,6 @@ struct tty_driver *uart_console_device(struct console *co, int *index);
 */
 int uart_register_driver(struct uart_driver *uart);
 void uart_unregister_driver(struct uart_driver *uart);
-void uart_unregister_port(struct uart_driver *reg, int line);
-int uart_register_port(struct uart_driver *reg, struct uart_port *port);
 int uart_add_one_port(struct uart_driver *reg, struct uart_port *port);
 int uart_remove_one_port(struct uart_driver *reg, struct uart_port *port);
 int uart_match_port(struct uart_port *port1, struct uart_port *port2);
@@ -467,13 +466,13 @@ uart_handle_cts_change(struct uart_port *port, unsigned int status)
                if (tty->hw_stopped) {
                        if (status) {
                                tty->hw_stopped = 0;
-                                port->ops->start_tx(port, 0);
+                                port->ops->start_tx(port);
                                uart_write_wakeup(port);
                        }
                } else {
                        if (!status) {
                                tty->hw_stopped = 1;
-                                port->ops->stop_tx(port, 0);
+                                port->ops->stop_tx(port);
                        }
                }
        }
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 5d4a990d5577..42edce6abe23 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -155,16 +155,29 @@ struct skb_shared_info {
 #define SKB_DATAREF_SHIFT 16
 #define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1)
+extern struct timeval skb_tv_base;
+struct skb_timeval {
+        u32     off_sec;
+        u32     off_usec;
+};
+enum {
+        SKB_FCLONE_UNAVAILABLE,
+        SKB_FCLONE_ORIG,
+        SKB_FCLONE_CLONE,
+};
 /** 
 *      struct sk_buff - socket buffer
 *      @next: Next buffer in list
 *      @prev: Previous buffer in list
 *      @list: List we are on
 *      @sk: Socket we are owned by
- *      @stamp: Time we arrived
+ *      @tstamp: Time we arrived stored as offset to skb_tv_base
 *      @dev: Device we arrived on/are leaving by
 *      @input_dev: Device we arrived on
- *      @real_dev: The real device we are using
 *      @h: Transport layer header
 *      @nh: Network layer header
 *      @mac: Link layer header
@@ -190,14 +203,11 @@ struct skb_shared_info {
 *      @end: End pointer
 *      @destructor: Destruct function
 *      @nfmark: Can be used for communication between hooks
- *      @nfcache: Cache info
 *      @nfct: Associated connection, if any
 *      @nfctinfo: Relationship of this skb to the connection
 *      @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
- *      @private: Data which is private to the HIPPI implementation
 *      @tc_index: Traffic control index
 *      @tc_verd: traffic control verdict
- *      @tc_classid: traffic control classid
 */
 struct sk_buff {
@@ -205,12 +215,10 @@ struct sk_buff {
        struct sk_buff          *next;
        struct sk_buff          *prev;
-        struct sk_buff_head     *list;
        struct sock             *sk;
-        struct timeval          stamp;
+        struct skb_timeval      tstamp;
        struct net_device       *dev;
        struct net_device       *input_dev;
-        struct net_device       *real_dev;
        union {
                struct tcphdr   *th;
@@ -252,33 +260,28 @@ struct sk_buff {
        __u8                    local_df:1,
                                cloned:1,
                                ip_summed:2,
-                                nohdr:1;
+                                nohdr:1,
-                                /* 3 bits spare */
+                                nfctinfo:3;
-        __u8                    pkt_type;
+        __u8                    pkt_type:3,
-        __u16                   protocol;
+                                fclone:2;
+        __be16                  protocol;
        void                    (*destructor)(struct sk_buff *skb);
 #ifdef CONFIG_NETFILTER
-        unsigned long           nfmark;
+        __u32                   nfmark;
-        __u32                   nfcache;
-        __u32                   nfctinfo;
        struct nf_conntrack     *nfct;
+#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
+        __u8                    ipvs_property:1;
+#endif
 #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
 #endif
 #endif /* CONFIG_NETFILTER */
-#if defined(CONFIG_HIPPI)
-        union {
-                __u32           ifield;
-        } private;
-#endif
 #ifdef CONFIG_NET_SCHED
-       __u32                    tc_index;        /* traffic control index */
+        __u16                   tc_index;       /* traffic control index */
 #ifdef CONFIG_NET_CLS_ACT
-        __u32           tc_verd;               /* traffic control verdict */
+        __u16                   tc_verd;        /* traffic control verdict */
-        __u32           tc_classid;            /* traffic control classid */
 #endif
 #endif
@@ -300,8 +303,20 @@ struct sk_buff {
 #include <asm/system.h>
 extern void            __kfree_skb(struct sk_buff *skb);
-extern struct sk_buff *alloc_skb(unsigned int size,
+extern struct sk_buff *__alloc_skb(unsigned int size,
-                                 unsigned int __nocast priority);
+                                   unsigned int __nocast priority, int fclone);
+static inline struct sk_buff *alloc_skb(unsigned int size,
+                                        unsigned int __nocast priority)
+{
+        return __alloc_skb(size, priority, 0);
+}
+static inline struct sk_buff *alloc_skb_fclone(unsigned int size,
+                                               unsigned int __nocast priority)
+{
+        return __alloc_skb(size, priority, 1);
+}
 extern struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
                                            unsigned int size,
                                            unsigned int __nocast priority);
@@ -502,7 +517,8 @@ static inline struct sk_buff *skb_share_check(struct sk_buff *skb,
 *
 *      %NULL is returned on a memory allocation failure.
 */
-static inline struct sk_buff *skb_unshare(struct sk_buff *skb, int pri)
+static inline struct sk_buff *skb_unshare(struct sk_buff *skb,
+                                          unsigned int __nocast pri)
 {
        might_sleep_if(pri & __GFP_WAIT);
        if (skb_cloned(skb)) {
@@ -596,7 +612,6 @@ static inline void __skb_queue_head(struct sk_buff_head *list,
 {
        struct sk_buff *prev, *next;
-        newsk->list = list;
        list->qlen++;
        prev = (struct sk_buff *)list;
        next = prev->next;
@@ -621,7 +636,6 @@ static inline void __skb_queue_tail(struct sk_buff_head *list,
 {
        struct sk_buff *prev, *next;
-        newsk->list = list;
        list->qlen++;
        next = (struct sk_buff *)list;
        prev = next->prev;
@@ -654,7 +668,6 @@ static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list)
                next->prev   = prev;
                prev->next   = next;
                result->next = result->prev = NULL;
-                result->list = NULL;
        }
        return result;
 }
@@ -663,7 +676,7 @@ static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list)
 /*
 *      Insert a packet on a list.
 */
-extern void        skb_insert(struct sk_buff *old, struct sk_buff *newsk);
+extern void        skb_insert(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head *list);
 static inline void __skb_insert(struct sk_buff *newsk,
                                struct sk_buff *prev, struct sk_buff *next,
                                struct sk_buff_head *list)
@@ -671,24 +684,23 @@ static inline void __skb_insert(struct sk_buff *newsk,
        newsk->next = next;
        newsk->prev = prev;
        next->prev  = prev->next = newsk;
-        newsk->list = list;
        list->qlen++;
 }
 /*
 *      Place a packet after a given packet in a list.
 */
-extern void        skb_append(struct sk_buff *old, struct sk_buff *newsk);
+extern void        skb_append(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head *list);
-static inline void __skb_append(struct sk_buff *old, struct sk_buff *newsk)
+static inline void __skb_append(struct sk_buff *old, struct sk_buff *newsk, struct sk_buff_head *list)
 {
-        __skb_insert(newsk, old, old->next, old->list);
+        __skb_insert(newsk, old, old->next, list);
 }
 /*
 * remove sk_buff from list. _Must_ be called atomically, and with
 * the list known..
 */
-extern void        skb_unlink(struct sk_buff *skb);
+extern void        skb_unlink(struct sk_buff *skb, struct sk_buff_head *list);
 static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list)
 {
        struct sk_buff *next, *prev;
@@ -697,7 +709,6 @@ static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list)
        next       = skb->next;
        prev       = skb->prev;
        skb->next  = skb->prev = NULL;
-        skb->list  = NULL;
        next->prev = prev;
        prev->next = next;
 }
@@ -1212,6 +1223,8 @@ extern void	       skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to);
 extern void            skb_split(struct sk_buff *skb,
                                 struct sk_buff *skb1, const u32 len);
+extern void            skb_release_data(struct sk_buff *skb);
 static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
                                       int len, void *buffer)
 {
@@ -1229,6 +1242,42 @@ static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
 extern void skb_init(void);
 extern void skb_add_mtu(int mtu);
+/**
+ *      skb_get_timestamp - get timestamp from a skb
+ *      @skb: skb to get stamp from
+ *      @stamp: pointer to struct timeval to store stamp in
+ *
+ *      Timestamps are stored in the skb as offsets to a base timestamp.
+ *      This function converts the offset back to a struct timeval and stores
+ *      it in stamp.
+ */
+static inline void skb_get_timestamp(struct sk_buff *skb, struct timeval *stamp)
+{
+        stamp->tv_sec  = skb->tstamp.off_sec;
+        stamp->tv_usec = skb->tstamp.off_usec;
+        if (skb->tstamp.off_sec) {
+                stamp->tv_sec  += skb_tv_base.tv_sec;
+                stamp->tv_usec += skb_tv_base.tv_usec;
+        }
+}
+/**
+ *      skb_set_timestamp - set timestamp of a skb
+ *      @skb: skb to set stamp of
+ *      @stamp: pointer to struct timeval to get stamp from
+ *
+ *      Timestamps are stored in the skb as offsets to a base timestamp.
+ *      This function converts a struct timeval to an offset and stores
+ *      it in the skb.
+ */
+static inline void skb_set_timestamp(struct sk_buff *skb, struct timeval *stamp)
+{
+        skb->tstamp.off_sec  = stamp->tv_sec - skb_tv_base.tv_sec;
+        skb->tstamp.off_usec = stamp->tv_usec - skb_tv_base.tv_usec;
+}
+extern void __net_timestamp(struct sk_buff *skb);
 #ifdef CONFIG_NETFILTER
 static inline void nf_conntrack_put(struct nf_conntrack *nfct)
 {
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 4c8e552471b0..80b2dfde2e80 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -111,7 +111,7 @@ static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int n
 {
        return kmem_cache_alloc(cachep, flags);
 }
-static inline void *kmalloc_node(size_t size, int flags, int node)
+static inline void *kmalloc_node(size_t size, unsigned int __nocast flags, int node)
 {
        return kmalloc(size, flags);
 }
diff --git a/include/linux/socket.h b/include/linux/socket.h
index a5c7d96e4d2e..1739c2d5b95b 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -26,6 +26,13 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>                /* pid_t                        */
 #include <linux/compiler.h>             /* __user                       */
+extern int sysctl_somaxconn;
+extern void sock_init(void);
+#ifdef CONFIG_PROC_FS
+struct seq_file;
+extern void socket_seq_show(struct seq_file *seq);
+#endif
 typedef unsigned short  sa_family_t;
 /*
@@ -271,6 +278,8 @@ struct ucred {
 #define SOL_IRDA        266
 #define SOL_NETBEUI     267
 #define SOL_LLC         268
+#define SOL_DCCP        269
+#define SOL_NETLINK     270
 /* IPX options */
 #define IPX_TYPE        1
diff --git a/include/linux/sound.h b/include/linux/sound.h
index 428f59794f48..72b9af4c3fd4 100644
--- a/include/linux/sound.h
+++ b/include/linux/sound.h
@@ -29,7 +29,9 @@
 *      Sound core interface functions
 */
 
+struct device;
 extern int register_sound_special(struct file_operations *fops, int unit);
+extern int register_sound_special_device(struct file_operations *fops, int unit, struct device *dev);
 extern int register_sound_mixer(struct file_operations *fops, int dev);
 extern int register_sound_midi(struct file_operations *fops, int dev);
 extern int register_sound_dsp(struct file_operations *fops, int dev);
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 34ec3e8d99b3..23448d0fb5bc 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -177,6 +177,7 @@ typedef int (*xdr_xcode_elem_t)(struct xdr_array2_desc *desc, void *elem);
 struct xdr_array2_desc {
        unsigned int elem_size;
        unsigned int array_len;
+        unsigned int array_maxlen;
        xdr_xcode_elem_t xcode;
 };
diff --git a/include/linux/swap.h b/include/linux/swap.h
index c75954f2d868..3c9ff0048153 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -7,6 +7,7 @@
 #include <linux/mmzone.h>
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <asm/atomic.h>
 #include <asm/page.h>
@@ -106,6 +107,8 @@ enum {
        SWP_USED        = (1 << 0),     /* is slot in swap_info[] used? */
        SWP_WRITEOK     = (1 << 1),     /* ok to write to this swap?    */
        SWP_ACTIVE      = (SWP_USED | SWP_WRITEOK),
+                                        /* add others here before... */
+        SWP_SCANNING    = (1 << 8),     /* refcount in scan_swap_map */
 };
 #define SWAP_CLUSTER_MAX 32
@@ -115,16 +118,13 @@ enum {
 /*
 * The in-memory structure used to track swap areas.
- * extent_list.prev points at the lowest-index extent.  That list is
- * sorted.
 */
 struct swap_info_struct {
        unsigned int flags;
-        spinlock_t sdev_lock;
+        int prio;                       /* swap priority */
        struct file *swap_file;
        struct block_device *bdev;
        struct list_head extent_list;
-        int nr_extents;
        struct swap_extent *curr_swap_extent;
        unsigned old_block_size;
        unsigned short * swap_map;
@@ -132,10 +132,9 @@ struct swap_info_struct {
        unsigned int highest_bit;
        unsigned int cluster_next;
        unsigned int cluster_nr;
-        int prio;                       /* swap priority */
+        unsigned int pages;
-        int pages;
+        unsigned int max;
-        unsigned long max;
+        unsigned int inuse_pages;
-        unsigned long inuse_pages;
        int next;                       /* next entry on swap list */
 };
@@ -221,13 +220,7 @@ extern int can_share_swap_page(struct page *);
 extern int remove_exclusive_swap_page(struct page *);
 struct backing_dev_info;
-extern struct swap_list_t swap_list;
+extern spinlock_t swap_lock;
-extern spinlock_t swaplock;
-#define swap_list_lock()        spin_lock(&swaplock)
-#define swap_list_unlock()      spin_unlock(&swaplock)
-#define swap_device_lock(p)     spin_lock(&p->sdev_lock)
-#define swap_device_unlock(p)   spin_unlock(&p->sdev_lock)
 /* linux/mm/thrash.c */
 extern struct mm_struct * swap_token_mm;
@@ -253,6 +246,8 @@ static inline void put_swap_token(struct mm_struct *mm)
 #define si_swapinfo(val) \
        do { (val)->freeswap = (val)->totalswap = 0; } while (0)
+/* only sparc can not include linux/pagemap.h in this file
+ * so leave page_cache_release and release_pages undeclared... */
 #define free_page_and_swap_cache(page) \
        page_cache_release(page)
 #define free_pages_and_swap_cache(pages, nr) \
diff --git a/include/linux/swapops.h b/include/linux/swapops.h
index d4c7db35e708..87b9d14c710d 100644
--- a/include/linux/swapops.h
+++ b/include/linux/swapops.h
@@ -4,7 +4,7 @@
 * the low-order bits.
 *
 * We arrange the `type' and `offset' fields so that `type' is at the five
- * high-order bits of the smp_entry_t and `offset' is right-aligned in the
+ * high-order bits of the swp_entry_t and `offset' is right-aligned in the
 * remaining bits.
 *
 * swp_entry_t's are *never* stored anywhere in their arch-dependent format.
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 5b5f434ac9a0..e82be96d4906 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -70,6 +70,14 @@ enum
        CTL_BUS_ISA=1           /* ISA */
 };
+/* /proc/sys/fs/inotify/ */
+enum
+{
+        INOTIFY_MAX_USER_INSTANCES=1,   /* max instances per user */
+        INOTIFY_MAX_USER_WATCHES=2,     /* max watches per user */
+        INOTIFY_MAX_QUEUED_EVENTS=3     /* max queued events per instance */
+};
 /* CTL_KERN names: */
 enum
 {
@@ -137,6 +145,7 @@ enum
        KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
        KERN_RANDOMIZE=68, /* int: randomize virtual address space */
        KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
+        KERN_SPIN_RETRY=70,     /* int: number of spinlock retries */
 };
@@ -676,6 +685,7 @@ enum
        FS_XFS=17,      /* struct: control xfs parameters */
        FS_AIO_NR=18,   /* current system-wide number of aio requests */
        FS_AIO_MAX_NR=19,       /* system-wide maximum number of aio requests */
+        FS_INOTIFY=20,  /* inotify submenu */
 };
 /* /proc/sys/fs/quota/ */
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index bcb762d93123..081b1ee8516e 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -41,19 +41,14 @@ enum
        TCF_META_ID_LOADAVG_1,
        TCF_META_ID_LOADAVG_2,
        TCF_META_ID_DEV,
-        TCF_META_ID_INDEV,
-        TCF_META_ID_REALDEV,
        TCF_META_ID_PRIORITY,
        TCF_META_ID_PROTOCOL,
-        TCF_META_ID_SECURITY, /* obsolete */
        TCF_META_ID_PKTTYPE,
        TCF_META_ID_PKTLEN,
        TCF_META_ID_DATALEN,
        TCF_META_ID_MACLEN,
        TCF_META_ID_NFMARK,
        TCF_META_ID_TCINDEX,
-        TCF_META_ID_TCVERDICT,
-        TCF_META_ID_TCCLASSID,
        TCF_META_ID_RTCLASSID,
        TCF_META_ID_RTIIF,
        TCF_META_ID_SK_FAMILY,
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index e4fd82e42104..ac4ca44c75ca 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -55,24 +55,6 @@ struct tcphdr {
        __u16   urg_ptr;
 };
-enum {
-  TCP_ESTABLISHED = 1,
-  TCP_SYN_SENT,
-  TCP_SYN_RECV,
-  TCP_FIN_WAIT1,
-  TCP_FIN_WAIT2,
-  TCP_TIME_WAIT,
-  TCP_CLOSE,
-  TCP_CLOSE_WAIT,
-  TCP_LAST_ACK,
-  TCP_LISTEN,
-  TCP_CLOSING,   /* now a valid state */
-  TCP_MAX_STATES /* Leave at the end! */
-};
-#define TCP_STATE_MASK  0xF
 #define TCP_ACTION_FIN  (1 << 7)
 enum {
@@ -195,8 +177,9 @@ struct tcp_info
 #include <linux/config.h>
 #include <linux/skbuff.h>
-#include <linux/ip.h>
 #include <net/sock.h>
+#include <net/inet_connection_sock.h>
+#include <net/inet_timewait_sock.h>
 /* This defines a selective acknowledgement block. */
 struct tcp_sack_block {
@@ -236,8 +219,8 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
 }
 struct tcp_sock {
-        /* inet_sock has to be the first member of tcp_sock */
+        /* inet_connection_sock has to be the first member of tcp_sock */
-        struct inet_sock        inet;
+        struct inet_connection_sock     inet_conn;
        int     tcp_header_len; /* Bytes of tcp header to send          */
 /*
@@ -258,19 +241,6 @@ struct tcp_sock {
        __u32   snd_sml;        /* Last byte of the most recently transmitted small packet */
        __u32   rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
        __u32   lsndtime;       /* timestamp of last sent data packet (for restart window) */
-        struct tcp_bind_bucket *bind_hash;
-        /* Delayed ACK control data */
-        struct {
-                __u8    pending;        /* ACK is pending */
-                __u8    quick;          /* Scheduled number of quick acks       */
-                __u8    pingpong;       /* The session is interactive           */
-                __u8    blocked;        /* Delayed ACK was blocked by socket lock*/
-                __u32   ato;            /* Predicted tick of soft clock         */
-                unsigned long timeout;  /* Currently scheduled timeout          */
-                __u32   lrcvtime;       /* timestamp of last received data packet*/
-                __u16   last_seg_size;  /* Size of last incoming segment        */
-                __u16   rcv_mss;        /* MSS used for delayed ACK decisions   */ 
-        } ack;
        /* Data for direct copy to user */
        struct {
@@ -288,19 +258,15 @@ struct tcp_sock {
        __u32   mss_cache;      /* Cached effective mss, not including SACKS */
        __u16   xmit_size_goal; /* Goal for segmenting output packets   */
        __u16   ext_header_len; /* Network protocol overhead (IP/IPv6 options) */
-        __u8    ca_state;       /* State of fast-retransmit machine     */
-        __u8    retransmits;    /* Number of unrecovered RTO timeouts.  */
-        __u16   advmss;         /* Advertised MSS                       */
        __u32   window_clamp;   /* Maximal window to advertise          */
        __u32   rcv_ssthresh;   /* Current window clamp                 */
        __u32   frto_highmark;  /* snd_nxt when RTO occurred */
        __u8    reordering;     /* Packet reordering metric.            */
        __u8    frto_counter;   /* Number of new acks after RTO */
+        __u8    nonagle;        /* Disable Nagle algorithm?             */
-        __u8    unused;
+        __u8    keepalive_probes; /* num of allowed keep alive probes   */
-        __u8    defer_accept;   /* User waits for some data after accept() */
 /* RTT measurement */
        __u32   srtt;           /* smoothed round trip time << 3        */
@@ -308,19 +274,13 @@ struct tcp_sock {
        __u32   mdev_max;       /* maximal mdev for the last rtt period */
        __u32   rttvar;         /* smoothed mdev_max                    */
        __u32   rtt_seq;        /* sequence number to update rttvar     */
-        __u32   rto;            /* retransmit timeout                   */
        __u32   packets_out;    /* Packets which are "in flight"        */
        __u32   left_out;       /* Packets which leaved network */
        __u32   retrans_out;    /* Retransmitted packets out            */
-        __u8    backoff;        /* backoff                              */
 /*
 *      Options received (usually on last packet, some only on SYN packets).
 */
-        __u8    nonagle;        /* Disable Nagle algorithm?             */
-        __u8    keepalive_probes; /* num of allowed keep alive probes   */
-        __u8    probes_out;     /* unanswered 0 window probes           */
        struct tcp_options_received rx_opt;
 /*
@@ -333,11 +293,6 @@ struct tcp_sock {
        __u32   snd_cwnd_used;
        __u32   snd_cwnd_stamp;
-        /* Two commonly used timers in both sender and receiver paths. */
-        unsigned long           timeout;
-        struct timer_list       retransmit_timer;       /* Resend (no ack)      */
-        struct timer_list       delack_timer;           /* Ack delay            */
        struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
        struct tcp_func         *af_specific;   /* Operations which are AF_INET{4,6} specific   */
@@ -352,8 +307,7 @@ struct tcp_sock {
        struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */
        struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/
-        __u8    syn_retries;    /* num of allowed syn retries */
+        __u16   advmss;         /* Advertised MSS                       */
-        __u8    ecn_flags;      /* ECN status bits.                     */
        __u16   prior_ssthresh; /* ssthresh saved at recovery start     */
        __u32   lost_out;       /* Lost packets                 */
        __u32   sacked_out;     /* SACK'd packets                       */
@@ -367,14 +321,12 @@ struct tcp_sock {
        int     undo_retrans;   /* number of undoable retransmissions. */
        __u32   urg_seq;        /* Seq of received urgent pointer */
        __u16   urg_data;       /* Saved octet of OOB data and control flags */
-        __u8    pending;        /* Scheduled timer event        */
        __u8    urg_mode;       /* In urgent mode               */
+        __u8    ecn_flags;      /* ECN status bits.                     */
        __u32   snd_up;         /* Urgent pointer               */
        __u32   total_retrans;  /* Total retransmits for entire connection */
-        struct request_sock_queue accept_queue; /* FIFO of established children */
        unsigned int            keepalive_time;   /* time before keep alive takes place */
        unsigned int            keepalive_intvl;  /* time interval between keep alive probes */
        int                     linger2;
@@ -394,11 +346,6 @@ struct tcp_sock {
                __u32   seq;
                __u32   time;
        } rcvq_space;
-        /* Pluggable TCP congestion control hook */
-        struct tcp_congestion_ops *ca_ops;
-        u32     ca_priv[16];
-#define TCP_CA_PRIV_SIZE        (16*sizeof(u32))
 };
 static inline struct tcp_sock *tcp_sk(const struct sock *sk)
@@ -406,9 +353,18 @@ static inline struct tcp_sock *tcp_sk(const struct sock *sk)
        return (struct tcp_sock *)sk;
 }
-static inline void *tcp_ca(const struct tcp_sock *tp)
+struct tcp_timewait_sock {
+        struct inet_timewait_sock tw_sk;
+        __u32                     tw_rcv_nxt;
+        __u32                     tw_snd_nxt;
+        __u32                     tw_rcv_wnd;
+        __u32                     tw_ts_recent;
+        long                      tw_ts_recent_stamp;
+};
+static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
 {
-        return (void *) tp->ca_priv;
+        return (struct tcp_timewait_sock *)sk;
 }
 #endif
diff --git a/include/linux/tcp_diag.h b/include/linux/tcp_diag.h
deleted file mode 100644
index 7a5996743946..000000000000
--- a/include/linux/tcp_diag.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#ifndef _TCP_DIAG_H_
-#define _TCP_DIAG_H_ 1
-/* Just some random number */
-#define TCPDIAG_GETSOCK 18
-/* Socket identity */
-struct tcpdiag_sockid
-{
-        __u16   tcpdiag_sport;
-        __u16   tcpdiag_dport;
-        __u32   tcpdiag_src[4];
-        __u32   tcpdiag_dst[4];
-        __u32   tcpdiag_if;
-        __u32   tcpdiag_cookie[2];
-#define TCPDIAG_NOCOOKIE (~0U)
-};
-/* Request structure */
-struct tcpdiagreq
-{
-        __u8    tcpdiag_family;         /* Family of addresses. */
-        __u8    tcpdiag_src_len;
-        __u8    tcpdiag_dst_len;
-        __u8    tcpdiag_ext;            /* Query extended information */
-        struct tcpdiag_sockid id;
-        __u32   tcpdiag_states;         /* States to dump */
-        __u32   tcpdiag_dbs;            /* Tables to dump (NI) */
-};
-enum
-{
-        TCPDIAG_REQ_NONE,
-        TCPDIAG_REQ_BYTECODE,
-};
-#define TCPDIAG_REQ_MAX TCPDIAG_REQ_BYTECODE
-/* Bytecode is sequence of 4 byte commands followed by variable arguments.
- * All the commands identified by "code" are conditional jumps forward:
- * to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
- * length of the command and its arguments.
- */
- 
-struct tcpdiag_bc_op
-{
-        unsigned char   code;
-        unsigned char   yes;
-        unsigned short  no;
-};
-enum
-{
-        TCPDIAG_BC_NOP,
-        TCPDIAG_BC_JMP,
-        TCPDIAG_BC_S_GE,
-        TCPDIAG_BC_S_LE,
-        TCPDIAG_BC_D_GE,
-        TCPDIAG_BC_D_LE,
-        TCPDIAG_BC_AUTO,
-        TCPDIAG_BC_S_COND,
-        TCPDIAG_BC_D_COND,
-};
-struct tcpdiag_hostcond
-{
-        __u8    family;
-        __u8    prefix_len;
-        int     port;
-        __u32   addr[0];
-};
-/* Base info structure. It contains socket identity (addrs/ports/cookie)
- * and, alas, the information shown by netstat. */
-struct tcpdiagmsg
-{
-        __u8    tcpdiag_family;
-        __u8    tcpdiag_state;
-        __u8    tcpdiag_timer;
-        __u8    tcpdiag_retrans;
-        struct tcpdiag_sockid id;
-        __u32   tcpdiag_expires;
-        __u32   tcpdiag_rqueue;
-        __u32   tcpdiag_wqueue;
-        __u32   tcpdiag_uid;
-        __u32   tcpdiag_inode;
-};
-/* Extensions */
-enum
-{
-        TCPDIAG_NONE,
-        TCPDIAG_MEMINFO,
-        TCPDIAG_INFO,
-        TCPDIAG_VEGASINFO,
-        TCPDIAG_CONG,
-};
-#define TCPDIAG_MAX TCPDIAG_CONG
-/* TCPDIAG_MEM */
-struct tcpdiag_meminfo
-{
-        __u32   tcpdiag_rmem;
-        __u32   tcpdiag_wmem;
-        __u32   tcpdiag_fmem;
-        __u32   tcpdiag_tmem;
-};
-/* TCPDIAG_VEGASINFO */
-struct tcpvegas_info {
-        __u32   tcpv_enabled;
-        __u32   tcpv_rttcnt;
-        __u32   tcpv_rtt;
-        __u32   tcpv_minrtt;
-};
-#endif /* _TCP_DIAG_H_ */
diff --git a/include/linux/types.h b/include/linux/types.h
index dcb13f865df9..2b678c22ca4a 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -123,6 +123,9 @@ typedef		__u64		u_int64_t;
 typedef         __s64           int64_t;
 #endif
+/* this is a special 64bit data type that is 8-byte aligned */
+#define aligned_u64 unsigned long long __attribute__((aligned(8)))
 /*
 * The type used for indexing onto a disc or disc partition.
 * If required, asm/types.h can override it and define
diff --git a/include/linux/uinput.h b/include/linux/uinput.h
index 4c2c82336d10..84876077027f 100644
--- a/include/linux/uinput.h
+++ b/include/linux/uinput.h
@@ -42,8 +42,7 @@ struct uinput_request {
        int                     code;   /* UI_FF_UPLOAD, UI_FF_ERASE */
        int                     retval;
-        wait_queue_head_t       waitq;
+        struct completion       done;
-        int                     completed;
        union {
                int             effect_id;
@@ -62,7 +61,7 @@ struct uinput_device {
        struct uinput_request   *requests[UINPUT_NUM_REQUESTS];
        wait_queue_head_t       requests_waitq;
-        struct semaphore        requests_sem;
+        spinlock_t              requests_lock;
 };
 #endif  /* __KERNEL__ */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index eb282b581546..724637792996 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -938,17 +938,17 @@ static inline void usb_fill_int_urb (struct urb *urb,
 }
 extern void usb_init_urb(struct urb *urb);
-extern struct urb *usb_alloc_urb(int iso_packets, int mem_flags);
+extern struct urb *usb_alloc_urb(int iso_packets, unsigned mem_flags);
 extern void usb_free_urb(struct urb *urb);
 #define usb_put_urb usb_free_urb
 extern struct urb *usb_get_urb(struct urb *urb);
-extern int usb_submit_urb(struct urb *urb, int mem_flags);
+extern int usb_submit_urb(struct urb *urb, unsigned mem_flags);
 extern int usb_unlink_urb(struct urb *urb);
 extern void usb_kill_urb(struct urb *urb);
 #define HAVE_USB_BUFFERS
 void *usb_buffer_alloc (struct usb_device *dev, size_t size,
-        int mem_flags, dma_addr_t *dma);
+        unsigned mem_flags, dma_addr_t *dma);
 void usb_buffer_free (struct usb_device *dev, size_t size,
        void *addr, dma_addr_t dma);
@@ -1055,7 +1055,7 @@ int usb_sg_init (
        struct scatterlist      *sg,
        int                     nents,
        size_t                  length,
-        int                     mem_flags
+        unsigned                mem_flags
 );
 void usb_sg_cancel (struct usb_sg_request *io);
 void usb_sg_wait (struct usb_sg_request *io);
diff --git a/include/linux/usb_cdc.h b/include/linux/usb_cdc.h
index f22d6beecc73..ba617c372455 100644
--- a/include/linux/usb_cdc.h
+++ b/include/linux/usb_cdc.h
@@ -34,6 +34,7 @@
 #define USB_CDC_ACM_TYPE                0x02            /* acm_descriptor */
 #define USB_CDC_UNION_TYPE              0x06            /* union_desc */
 #define USB_CDC_COUNTRY_TYPE            0x07
+#define USB_CDC_NETWORK_TERMINAL_TYPE   0x0a            /* network_terminal_desc */
 #define USB_CDC_ETHERNET_TYPE           0x0f            /* ether_desc */
 #define USB_CDC_WHCM_TYPE               0x11
 #define USB_CDC_MDLM_TYPE               0x12            /* mdlm_desc */
@@ -83,6 +84,18 @@ struct usb_cdc_union_desc {
        /* ... and there could be other slave interfaces */
 } __attribute__ ((packed));
+/* "Network Channel Terminal Functional Descriptor" from CDC spec 5.2.3.11 */
+struct usb_cdc_network_terminal_desc {
+        __u8    bLength;
+        __u8    bDescriptorType;
+        __u8    bDescriptorSubType;
+        __u8    bEntityId;
+        __u8    iName;
+        __u8    bChannelIndex;
+        __u8    bPhysicalInterface;
+} __attribute__ ((packed));
 /* "Ethernet Networking Functional Descriptor" from CDC spec 5.2.3.16 */
 struct usb_cdc_ether_desc {
        __u8    bLength;
diff --git a/include/linux/usb_gadget.h b/include/linux/usb_gadget.h
index b00f127cb447..71e608607324 100644
--- a/include/linux/usb_gadget.h
+++ b/include/linux/usb_gadget.h
@@ -107,18 +107,18 @@ struct usb_ep_ops {
        int (*disable) (struct usb_ep *ep);
        struct usb_request *(*alloc_request) (struct usb_ep *ep,
-                int gfp_flags);
+                unsigned gfp_flags);
        void (*free_request) (struct usb_ep *ep, struct usb_request *req);
        void *(*alloc_buffer) (struct usb_ep *ep, unsigned bytes,
-                dma_addr_t *dma, int gfp_flags);
+                dma_addr_t *dma, unsigned gfp_flags);
        void (*free_buffer) (struct usb_ep *ep, void *buf, dma_addr_t dma,
                unsigned bytes);
        // NOTE:  on 2.6, drivers may also use dma_map() and
        // dma_sync_single_*() to directly manage dma overhead. 
        int (*queue) (struct usb_ep *ep, struct usb_request *req,
-                int gfp_flags);
+                unsigned gfp_flags);
        int (*dequeue) (struct usb_ep *ep, struct usb_request *req);
        int (*set_halt) (struct usb_ep *ep, int value);
@@ -214,7 +214,7 @@ usb_ep_disable (struct usb_ep *ep)
 * Returns the request, or null if one could not be allocated.
 */
 static inline struct usb_request *
-usb_ep_alloc_request (struct usb_ep *ep, int gfp_flags)
+usb_ep_alloc_request (struct usb_ep *ep, unsigned gfp_flags)
 {
        return ep->ops->alloc_request (ep, gfp_flags);
 }
@@ -254,7 +254,7 @@ usb_ep_free_request (struct usb_ep *ep, struct usb_request *req)
 */
 static inline void *
 usb_ep_alloc_buffer (struct usb_ep *ep, unsigned len, dma_addr_t *dma,
-        int gfp_flags)
+        unsigned gfp_flags)
 {
        return ep->ops->alloc_buffer (ep, len, dma, gfp_flags);
 }
@@ -330,7 +330,7 @@ usb_ep_free_buffer (struct usb_ep *ep, void *buf, dma_addr_t dma, unsigned len)
 * reported when the usb peripheral is disconnected.
 */
 static inline int
-usb_ep_queue (struct usb_ep *ep, struct usb_request *req, int gfp_flags)
+usb_ep_queue (struct usb_ep *ep, struct usb_request *req, unsigned gfp_flags)
 {
        return ep->ops->queue (ep, req, gfp_flags);
 }
diff --git a/include/linux/usb_input.h b/include/linux/usb_input.h
new file mode 100644
index 000000000000..716e0cc16043
--- /dev/null
+++ b/include/linux/usb_input.h
@@ -0,0 +1,25 @@
+#ifndef __USB_INPUT_H
+#define __USB_INPUT_H
+/*
+ * Copyright (C) 2005 Dmitry Torokhov
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#include <linux/usb.h>
+#include <linux/input.h>
+#include <asm/byteorder.h>
+static inline void
+usb_to_input_id(const struct usb_device *dev, struct input_id *id)
+{
+        id->bustype = BUS_USB;
+        id->vendor = le16_to_cpu(dev->descriptor.idVendor);
+        id->product = le16_to_cpu(dev->descriptor.idProduct);
+        id->version = le16_to_cpu(dev->descriptor.bcdDevice);
+}
+#endif
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 6409d9cf5965..b244f69ef682 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -10,6 +10,14 @@
 #define VM_MAP          0x00000004      /* vmap()ed pages */
 /* bits [20..32] reserved for arch specific ioremap internals */
+/*
+ * Maximum alignment for ioremap() regions.
+ * Can be overriden by arch-specific value.
+ */
+#ifndef IOREMAP_MAX_ORDER
+#define IOREMAP_MAX_ORDER       (7 + PAGE_SHIFT)        /* 128 pages */
+#endif
 struct vm_struct {
        void                    *addr;
        unsigned long           size;
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h
index 3e89f0f15f49..1b6b76a4eb54 100644
--- a/include/linux/wanrouter.h
+++ b/include/linux/wanrouter.h
@@ -516,8 +516,7 @@ struct wan_device {
 /* Public functions available for device drivers */
 extern int register_wan_device(struct wan_device *wandev);
 extern int unregister_wan_device(char *name);
-unsigned short wanrouter_type_trans(struct sk_buff *skb,
+__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev);
-                                    struct net_device *dev);
 int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev,
                          unsigned short type);
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index 88ba0d29f8c8..1192ed8f4fe8 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -47,4 +47,14 @@ struct watchdog_info {
 #define WDIOS_ENABLECARD        0x0002  /* Turn on the watchdog timer */
 #define WDIOS_TEMPPANIC         0x0004  /* Kernel panic on temperature trip */
+#ifdef __KERNEL__
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+#define WATCHDOG_NOWAYOUT       1
+#else
+#define WATCHDOG_NOWAYOUT       0
+#endif
+#endif  /* __KERNEL__ */
 #endif  /* ifndef _LINUX_WATCHDOG_H */
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index f0d423300d84..0fb077d68441 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -258,9 +258,27 @@ struct xfrm_usersa_flush {
        __u8                            proto;
 };
+#ifndef __KERNEL__
+/* backwards compatibility for userspace */
 #define XFRMGRP_ACQUIRE         1
 #define XFRMGRP_EXPIRE          2
 #define XFRMGRP_SA              4
 #define XFRMGRP_POLICY          8
+#endif
+enum xfrm_nlgroups {
+        XFRMNLGRP_NONE,
+#define XFRMNLGRP_NONE          XFRMNLGRP_NONE
+        XFRMNLGRP_ACQUIRE,
+#define XFRMNLGRP_ACQUIRE       XFRMNLGRP_ACQUIRE
+        XFRMNLGRP_EXPIRE,
+#define XFRMNLGRP_EXPIRE        XFRMNLGRP_EXPIRE
+        XFRMNLGRP_SA,
+#define XFRMNLGRP_SA            XFRMNLGRP_SA
+        XFRMNLGRP_POLICY,
+#define XFRMNLGRP_POLICY        XFRMNLGRP_POLICY
+        __XFRMNLGRP_MAX
+};
+#define XFRMNLGRP_MAX   (__XFRMNLGRP_MAX - 1)
 #endif /* _LINUX_XFRM_H */
diff --git a/include/linux/zlib.h b/include/linux/zlib.h
index 850076ea14d3..74f7b78c22d2 100644
--- a/include/linux/zlib.h
+++ b/include/linux/zlib.h
@@ -506,6 +506,11 @@ extern int zlib_deflateReset (z_streamp strm);
   stream state was inconsistent (such as zalloc or state being NULL).
 */
+static inline unsigned long deflateBound(unsigned long s)
+{
+        return s + ((s + 7) >> 3) + ((s + 63) >> 6) + 11;
+}
 extern int zlib_deflateParams (z_streamp strm, int level, int strategy);
 /*
     Dynamically update the compression level and compression strategy.  The