216 files changed, 3737 insertions, 3234 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 670fdb5142d1..86c52520ed34 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -55,7 +55,7 @@ if ACPI_INTERPRETER
 config ACPI_SLEEP
        bool "Sleep States (EXPERIMENTAL)"
-        depends on X86
+        depends on X86 && (!SMP || SUSPEND_SMP)
        depends on EXPERIMENTAL && PM
        default y
        ---help---
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 8093f2e00321..8dbf802ee7f8 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -435,6 +435,7 @@ acpi_pci_irq_enable (
                /* Interrupt Line values above 0xF are forbidden */
                if (dev->irq >= 0 && (dev->irq <= 0xF)) {
                        printk(" - using IRQ %d\n", dev->irq);
+                        acpi_register_gsi(dev->irq, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
                        return_VALUE(0);
                }
                else {
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 6ef3069b5710..b79badd0f158 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -16,6 +16,11 @@ struct sysdev_class cpu_sysdev_class = {
 EXPORT_SYMBOL(cpu_sysdev_class);
 #ifdef CONFIG_HOTPLUG_CPU
+int __attribute__((weak)) smp_prepare_cpu (int cpu)
+{
+        return 0;
+}
 static ssize_t show_online(struct sys_device *dev, char *buf)
 {
        struct cpu *cpu = container_of(dev, struct cpu, sysdev);
@@ -36,7 +41,11 @@ static ssize_t store_online(struct sys_device *dev, const char *buf,
                        kobject_hotplug(&dev->kobj, KOBJ_OFFLINE);
                break;
        case '1':
-                ret = cpu_up(cpu->sysdev.id);
+                ret = smp_prepare_cpu(cpu->sysdev.id);
+                if (!ret)
+                        ret = cpu_up(cpu->sysdev.id);
+                if (!ret)
+                        kobject_hotplug(&dev->kobj, KOBJ_ONLINE);
                break;
        default:
                ret = -EINVAL;
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index fd94ea27d594..60e64091de1b 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -37,6 +37,7 @@
 static void blk_unplug_work(void *data);
 static void blk_unplug_timeout(unsigned long data);
+static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io);
 /*
 * For the allocated request tables
@@ -1137,7 +1138,7 @@ new_hw_segment:
 }
-int blk_phys_contig_segment(request_queue_t *q, struct bio *bio,
+static int blk_phys_contig_segment(request_queue_t *q, struct bio *bio,
                                   struct bio *nxt)
 {
        if (!(q->queue_flags & (1 << QUEUE_FLAG_CLUSTER)))
@@ -1158,9 +1159,7 @@ int blk_phys_contig_segment(request_queue_t *q, struct bio *bio,
        return 0;
 }
-EXPORT_SYMBOL(blk_phys_contig_segment);
+static int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,
-int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,
                                 struct bio *nxt)
 {
        if (unlikely(!bio_flagged(bio, BIO_SEG_VALID)))
@@ -1176,8 +1175,6 @@ int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,
        return 1;
 }
-EXPORT_SYMBOL(blk_hw_contig_segment);
 /*
 * map a request to scatterlist, return number of sg entries setup. Caller
 * must make sure sg can hold rq->nr_phys_segments entries
@@ -1347,8 +1344,8 @@ static int ll_front_merge_fn(request_queue_t *q, struct request *req,
 static int ll_merge_requests_fn(request_queue_t *q, struct request *req,
                                struct request *next)
 {
-        int total_phys_segments = req->nr_phys_segments +next->nr_phys_segments;
+        int total_phys_segments;
-        int total_hw_segments = req->nr_hw_segments + next->nr_hw_segments;
+        int total_hw_segments;
        /*
         * First check if the either of the requests are re-queued
@@ -1358,7 +1355,7 @@ static int ll_merge_requests_fn(request_queue_t *q, struct request *req,
                return 0;
        /*
-         * Will it become to large?
+         * Will it become too large?
         */
        if ((req->nr_sectors + next->nr_sectors) > q->max_sectors)
                return 0;
@@ -1825,7 +1822,7 @@ static inline int ioc_batching(request_queue_t *q, struct io_context *ioc)
 * is the behaviour we want though - once it gets a wakeup it should be given
 * a nice run.
 */
-void ioc_set_batching(request_queue_t *q, struct io_context *ioc)
+static void ioc_set_batching(request_queue_t *q, struct io_context *ioc)
 {
        if (!ioc || ioc_batching(q, ioc))
                return;
@@ -2254,45 +2251,7 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)
 EXPORT_SYMBOL(blkdev_issue_flush);
-/**
+static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)
- * blkdev_scsi_issue_flush_fn - issue flush for SCSI devices
- * @q:          device queue
- * @disk:       gendisk
- * @error_sector:       error offset
- *
- * Description:
- *    Devices understanding the SCSI command set, can use this function as
- *    a helper for issuing a cache flush. Note: driver is required to store
- *    the error offset (in case of error flushing) in ->sector of struct
- *    request.
- */
-int blkdev_scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
-                               sector_t *error_sector)
-{
-        struct request *rq = blk_get_request(q, WRITE, __GFP_WAIT);
-        int ret;
-        rq->flags |= REQ_BLOCK_PC | REQ_SOFTBARRIER;
-        rq->sector = 0;
-        memset(rq->cmd, 0, sizeof(rq->cmd));
-        rq->cmd[0] = 0x35;
-        rq->cmd_len = 12;
-        rq->data = NULL;
-        rq->data_len = 0;
-        rq->timeout = 60 * HZ;
-        ret = blk_execute_rq(q, disk, rq);
-        if (ret && error_sector)
-                *error_sector = rq->sector;
-        blk_put_request(rq);
-        return ret;
-}
-EXPORT_SYMBOL(blkdev_scsi_issue_flush_fn);
-void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)
 {
        int rw = rq_data_dir(rq);
@@ -2551,16 +2510,6 @@ void blk_attempt_remerge(request_queue_t *q, struct request *rq)
 EXPORT_SYMBOL(blk_attempt_remerge);
-/*
- * Non-locking blk_attempt_remerge variant.
- */
-void __blk_attempt_remerge(request_queue_t *q, struct request *rq)
-{
-        attempt_back_merge(q, rq);
-}
-EXPORT_SYMBOL(__blk_attempt_remerge);
 static int __make_request(request_queue_t *q, struct bio *bio)
 {
        struct request *req, *freereq = NULL;
@@ -2971,7 +2920,7 @@ void submit_bio(int rw, struct bio *bio)
 EXPORT_SYMBOL(submit_bio);
-void blk_recalc_rq_segments(struct request *rq)
+static void blk_recalc_rq_segments(struct request *rq)
 {
        struct bio *bio, *prevbio = NULL;
        int nr_phys_segs, nr_hw_segs;
@@ -3013,7 +2962,7 @@ void blk_recalc_rq_segments(struct request *rq)
        rq->nr_hw_segments = nr_hw_segs;
 }
-void blk_recalc_rq_sectors(struct request *rq, int nsect)
+static void blk_recalc_rq_sectors(struct request *rq, int nsect)
 {
        if (blk_fs_request(rq)) {
                rq->hard_sector += nsect;
@@ -3601,7 +3550,7 @@ static struct sysfs_ops queue_sysfs_ops = {
        .store  = queue_attr_store,
 };
-struct kobj_type queue_ktype = {
+static struct kobj_type queue_ktype = {
        .sysfs_ops      = &queue_sysfs_ops,
        .default_attrs  = default_attrs,
 };
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 7f3d78de265c..7b838342f0a3 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -1251,8 +1251,7 @@ static int kcdrwd(void *foobar)
                        VPRINTK("kcdrwd: wake up\n");
                        /* make swsusp happy with our thread */
-                        if (current->flags & PF_FREEZE)
+                        try_to_freeze();
-                                refrigerator(PF_FREEZE);
                        list_for_each_entry(pkt, &pd->cdrw.pkt_active_list, list) {
                                if (!pkt->sleep_time)
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index da80b14335a5..01f035173328 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -307,7 +307,7 @@ static DEFINE_SPINLOCK(cm206_lock);
 /* First, we define some polling functions. These are actually
   only being used in the initialization. */
-void send_command_polled(int command)
+static void send_command_polled(int command)
 {
        int loop = POLLOOP;
        while (!(inw(r_line_status) & ls_transmitter_buffer_empty)
@@ -318,7 +318,7 @@ void send_command_polled(int command)
        outw(command, r_uart_transmit);
 }
-uch receive_echo_polled(void)
+static uch receive_echo_polled(void)
 {
        int loop = POLLOOP;
        while (!(inw(r_line_status) & ls_receive_buffer_full) && loop > 0) {
@@ -328,13 +328,13 @@ uch receive_echo_polled(void)
        return ((uch) inw(r_uart_receive));
 }
-uch send_receive_polled(int command)
+static uch send_receive_polled(int command)
 {
        send_command_polled(command);
        return receive_echo_polled();
 }
-inline void clear_ur(void)
+static inline void clear_ur(void)
 {
        if (cd->ur_r != cd->ur_w) {
                debug(("Deleting bytes from fifo:"));
@@ -439,7 +439,7 @@ static irqreturn_t cm206_interrupt(int sig, void *dev_id, struct pt_regs *regs)
 }
 /* we have put the address of the wait queue in who */
-void cm206_timeout(unsigned long who)
+static void cm206_timeout(unsigned long who)
 {
        cd->timed_out = 1;
        debug(("Timing out\n"));
@@ -448,7 +448,7 @@ void cm206_timeout(unsigned long who)
 /* This function returns 1 if a timeout occurred, 0 if an interrupt
   happened */
-int sleep_or_timeout(wait_queue_head_t * wait, int timeout)
+static int sleep_or_timeout(wait_queue_head_t * wait, int timeout)
 {
        cd->timed_out = 0;
        init_timer(&cd->timer);
@@ -465,13 +465,7 @@ int sleep_or_timeout(wait_queue_head_t * wait, int timeout)
                return 0;
 }
-void cm206_delay(int nr_jiffies)
+static void send_command(int command)
-{
-        DECLARE_WAIT_QUEUE_HEAD(wait);
-        sleep_or_timeout(&wait, nr_jiffies);
-}
-void send_command(int command)
 {
        debug(("Sending 0x%x\n", command));
        if (!(inw(r_line_status) & ls_transmitter_buffer_empty)) {
@@ -490,7 +484,7 @@ void send_command(int command)
                outw(command, r_uart_transmit);
 }
-uch receive_byte(int timeout)
+static uch receive_byte(int timeout)
 {
        uch ret;
        cli();
@@ -521,23 +515,23 @@ uch receive_byte(int timeout)
        return ret;
 }
-inline uch receive_echo(void)
+static inline uch receive_echo(void)
 {
        return receive_byte(UART_TIMEOUT);
 }
-inline uch send_receive(int command)
+static inline uch send_receive(int command)
 {
        send_command(command);
        return receive_echo();
 }
-inline uch wait_dsb(void)
+static inline uch wait_dsb(void)
 {
        return receive_byte(DSB_TIMEOUT);
 }
-int type_0_command(int command, int expect_dsb)
+static int type_0_command(int command, int expect_dsb)
 {
        int e;
        clear_ur();
@@ -552,7 +546,7 @@ int type_0_command(int command, int expect_dsb)
        return 0;
 }
-int type_1_command(int command, int bytes, uch * status)
+static int type_1_command(int command, int bytes, uch * status)
 {                               /* returns info */
        int i;
        if (type_0_command(command, 0))
@@ -564,7 +558,7 @@ int type_1_command(int command, int bytes, uch * status)
 /* This function resets the adapter card. We'd better not do this too
 * often, because it tends to generate `lost interrupts.' */
-void reset_cm260(void)
+static void reset_cm260(void)
 {
        outw(dc_normal | dc_initialize | READ_AHEAD, r_data_control);
        udelay(10);             /* 3.3 mu sec minimum */
@@ -572,7 +566,7 @@ void reset_cm260(void)
 }
 /* fsm: frame-sec-min from linear address; one of many */
-void fsm(int lba, uch * fsm)
+static void fsm(int lba, uch * fsm)
 {
        fsm[0] = lba % 75;
        lba /= 75;
@@ -581,17 +575,17 @@ void fsm(int lba, uch * fsm)
        fsm[2] = lba / 60;
 }
-inline int fsm2lba(uch * fsm)
+static inline int fsm2lba(uch * fsm)
 {
        return fsm[0] + 75 * (fsm[1] - 2 + 60 * fsm[2]);
 }
-inline int f_s_m2lba(uch f, uch s, uch m)
+static inline int f_s_m2lba(uch f, uch s, uch m)
 {
        return f + 75 * (s - 2 + 60 * m);
 }
-int start_read(int start)
+static int start_read(int start)
 {
        uch read_sector[4] = { c_read_data, };
        int i, e;
@@ -613,7 +607,7 @@ int start_read(int start)
        return 0;
 }
-int stop_read(void)
+static int stop_read(void)
 {
        int e;
        type_0_command(c_stop, 0);
@@ -630,7 +624,7 @@ int stop_read(void)
   routine takes care of this. Set a flag `background' in the cd
   struct to indicate the process. */
-int read_background(int start, int reading)
+static int read_background(int start, int reading)
 {
        if (cd->background)
                return -1;      /* can't do twice */
@@ -658,7 +652,7 @@ void transport_data(int port, ush * dest, int count)
 #define MAX_TRIES 100
-int read_sector(int start)
+static int read_sector(int start)
 {
        int tries = 0;
        if (cd->background) {
@@ -753,7 +747,7 @@ static DECLARE_TASKLET(cm206_tasklet, cm206_tasklet_func, 0);
 /* This command clears the dsb_possible_media_change flag, so we must 
 * retain it.
 */
-void get_drive_status(void)
+static void get_drive_status(void)
 {
        uch status[2];
        type_1_command(c_drive_status, 2, status);      /* this might be done faster */
@@ -764,7 +758,7 @@ void get_drive_status(void)
                          dsb_drive_not_ready | dsb_tray_not_closed));
 }
-void get_disc_status(void)
+static void get_disc_status(void)
 {
        if (type_1_command(c_disc_status, 7, cd->disc_status)) {
                debug(("get_disc_status: error\n"));
@@ -801,7 +795,7 @@ static void cm206_release(struct cdrom_device_info *cdi)
 /* Empty buffer empties $sectors$ sectors of the adapter card buffer,
 * and then reads a sector in kernel memory.  */
-void empty_buffer(int sectors)
+static void empty_buffer(int sectors)
 {
        while (sectors >= 0) {
                transport_data(r_fifo_output_buffer,
@@ -819,7 +813,7 @@ void empty_buffer(int sectors)
 /* try_adapter. This function determines if the requested sector is
   in adapter memory, or will appear there soon. Returns 0 upon
   success */
-int try_adapter(int sector)
+static int try_adapter(int sector)
 {
        if (cd->adapter_first <= sector && sector < cd->adapter_last) {
                /* sector is in adapter memory */
@@ -910,7 +904,7 @@ static void do_cm206_request(request_queue_t * q)
 */
 /* seek seeks to address lba. It does wait to arrive there. */
-void seek(int lba)
+static void seek(int lba)
 {
        int i;
        uch seek_command[4] = { c_seek, };
@@ -926,7 +920,7 @@ uch bcdbin(unsigned char bcd)
        return (bcd >> 4) * 10 + (bcd & 0xf);
 }
-inline uch normalize_track(uch track)
+static inline uch normalize_track(uch track)
 {
        if (track < 1)
                return 1;
@@ -939,7 +933,7 @@ inline uch normalize_track(uch track)
 * tracks seen in the process. Input $track$ must be between 1 and
 * #-of-tracks+1.  Note that the start of the disc must be in toc[1].fsm. 
 */
-int get_toc_lba(uch track)
+static int get_toc_lba(uch track)
 {
        int max = 74 * 60 * 75 - 150, min = fsm2lba(cd->toc[1].fsm);
        int i, lba, l, old_lba = 0;
@@ -991,7 +985,7 @@ int get_toc_lba(uch track)
        return lba;
 }
-void update_toc_entry(uch track)
+static void update_toc_entry(uch track)
 {
        track = normalize_track(track);
        if (!cd->toc[track].track)
@@ -999,7 +993,7 @@ void update_toc_entry(uch track)
 }
 /* return 0 upon success */
-int read_toc_header(struct cdrom_tochdr *hp)
+static int read_toc_header(struct cdrom_tochdr *hp)
 {
        if (!FIRST_TRACK)
                get_disc_status();
@@ -1016,7 +1010,7 @@ int read_toc_header(struct cdrom_tochdr *hp)
        return -1;
 }
-void play_from_to_msf(struct cdrom_msf *msfp)
+static void play_from_to_msf(struct cdrom_msf *msfp)
 {
        uch play_command[] = { c_play,
                msfp->cdmsf_frame0, msfp->cdmsf_sec0, msfp->cdmsf_min0,
@@ -1032,7 +1026,7 @@ void play_from_to_msf(struct cdrom_msf *msfp)
        cd->dsb = wait_dsb();
 }
-void play_from_to_track(int from, int to)
+static void play_from_to_track(int from, int to)
 {
        uch play_command[8] = { c_play, };
        int i;
@@ -1059,7 +1053,7 @@ void play_from_to_track(int from, int to)
        cd->dsb = wait_dsb();
 }
-int get_current_q(struct cdrom_subchnl *qp)
+static int get_current_q(struct cdrom_subchnl *qp)
 {
        int i;
        uch *q = cd->q;
@@ -1093,14 +1087,14 @@ int get_current_q(struct cdrom_subchnl *qp)
        return 0;
 }
-void invalidate_toc(void)
+static void invalidate_toc(void)
 {
        memset(cd->toc, 0, sizeof(cd->toc));
        memset(cd->disc_status, 0, sizeof(cd->disc_status));
 }
 /* cdrom.c guarantees that cdte_format == CDROM_MSF */
-void get_toc_entry(struct cdrom_tocentry *ep)
+static void get_toc_entry(struct cdrom_tocentry *ep)
 {
        uch track = normalize_track(ep->cdte_track);
        update_toc_entry(track);
@@ -1117,8 +1111,8 @@ void get_toc_entry(struct cdrom_tocentry *ep)
 * upon success. Memory checking has been done by cdrom_ioctl(), the
 * calling function, as well as LBA/MSF sanitization.
 */
-int cm206_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
+static int cm206_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
-                      void *arg)
+                             void *arg)
 {
        switch (cmd) {
        case CDROMREADTOCHDR:
@@ -1189,7 +1183,7 @@ static int cm206_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
        }
 }
-int cm206_media_changed(struct cdrom_device_info *cdi, int disc_nr)
+static int cm206_media_changed(struct cdrom_device_info *cdi, int disc_nr)
 {
        if (cd != NULL) {
                int r;
@@ -1204,16 +1198,9 @@ int cm206_media_changed(struct cdrom_device_info *cdi, int disc_nr)
 /* The new generic cdrom support. Routines should be concise, most of
   the logic should be in cdrom.c */
-/* returns number of times device is in use */
-int cm206_open_files(struct cdrom_device_info *cdi)
-{
-        if (cd)
-                return cd->openfiles;
-        return -1;
-}
 /* controls tray movement */
-int cm206_tray_move(struct cdrom_device_info *cdi, int position)
+static int cm206_tray_move(struct cdrom_device_info *cdi, int position)
 {
        if (position) {         /* 1: eject */
                type_0_command(c_open_tray, 1);
@@ -1224,7 +1211,7 @@ int cm206_tray_move(struct cdrom_device_info *cdi, int position)
 }
 /* gives current state of the drive */
-int cm206_drive_status(struct cdrom_device_info *cdi, int slot_nr)
+static int cm206_drive_status(struct cdrom_device_info *cdi, int slot_nr)
 {
        get_drive_status();
        if (cd->dsb & dsb_tray_not_closed)
@@ -1237,7 +1224,7 @@ int cm206_drive_status(struct cdrom_device_info *cdi, int slot_nr)
 }
 /* locks or unlocks door lock==1: lock; return 0 upon success */
-int cm206_lock_door(struct cdrom_device_info *cdi, int lock)
+static int cm206_lock_door(struct cdrom_device_info *cdi, int lock)
 {
        uch command = (lock) ? c_lock_tray : c_unlock_tray;
        type_0_command(command, 1);     /* wait and get dsb */
@@ -1248,8 +1235,8 @@ int cm206_lock_door(struct cdrom_device_info *cdi, int lock)
 /* Although a session start should be in LBA format, we return it in 
   MSF format because it is slightly easier, and the new generic ioctl
   will take care of the necessary conversion. */
-int cm206_get_last_session(struct cdrom_device_info *cdi,
+static int cm206_get_last_session(struct cdrom_device_info *cdi,
-                           struct cdrom_multisession *mssp)
+                                  struct cdrom_multisession *mssp)
 {
        if (!FIRST_TRACK)
                get_disc_status();
@@ -1268,7 +1255,7 @@ int cm206_get_last_session(struct cdrom_device_info *cdi,
        return 0;
 }
-int cm206_get_upc(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn)
+static int cm206_get_upc(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn)
 {
        uch upc[10];
        char *ret = mcn->medium_catalog_number;
@@ -1287,7 +1274,7 @@ int cm206_get_upc(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn)
        return 0;
 }
-int cm206_reset(struct cdrom_device_info *cdi)
+static int cm206_reset(struct cdrom_device_info *cdi)
 {
        stop_read();
        reset_cm260();
@@ -1300,7 +1287,7 @@ int cm206_reset(struct cdrom_device_info *cdi)
        return 0;
 }
-int cm206_select_speed(struct cdrom_device_info *cdi, int speed)
+static int cm206_select_speed(struct cdrom_device_info *cdi, int speed)
 {
        int r;
        switch (speed) {
@@ -1392,7 +1379,7 @@ static struct gendisk *cm206_gendisk;
   request_region, 15 bits of one port and 6 of another make things
   likely enough to accept the region on the first hit...
 */
-int __init probe_base_port(int base)
+static int __init probe_base_port(int base)
 {
        int b = 0x300, e = 0x370;       /* this is the range of start addresses */
        volatile int fool, i;
@@ -1416,7 +1403,7 @@ int __init probe_base_port(int base)
 #if !defined(MODULE) || defined(AUTO_PROBE_MODULE)
 /* Probe for irq# nr. If nr==0, probe for all possible irq's. */
-int __init probe_irq(int nr)
+static int __init probe_irq(int nr)
 {
        int irqs, irq;
        outw(dc_normal | READ_AHEAD, r_data_control);   /* disable irq-generation */
@@ -1558,7 +1545,7 @@ static void __init parse_options(void)
        }
 }
-int __cm206_init(void)
+static int __cm206_init(void)
 {
        parse_options();
 #if !defined(AUTO_PROBE_MODULE)
@@ -1567,7 +1554,7 @@ int __cm206_init(void)
        return cm206_init();
 }
-void __exit cm206_exit(void)
+static void __exit cm206_exit(void)
 {
        del_gendisk(cm206_gendisk);
        put_disk(cm206_gendisk);
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index f4be7bfd6675..9f22e8f1f6c0 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1605,8 +1605,7 @@ out7:
        put_disk(cdu_disk);
 out6:
        for (i = 0; i < sony_buffer_sectors; i++)
-                if (sony_buffer[i]) 
+                kfree(sony_buffer[i]);
-                        kfree(sony_buffer[i]);
 out5:
        kfree(sony_buffer);
 out4:
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7ccf871d3c9d..43d0cb19ef6a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -940,8 +940,8 @@ config RAW_DRIVER
          Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. 
          See the raw(8) manpage for more details.
-          The raw driver is deprecated and may be removed from 2.7
+          The raw driver is deprecated and will be removed soon.
-          kernels.  Applications should simply open the device (eg /dev/hda1)
+          Applications should simply open the device (eg /dev/hda1)
          with the O_DIRECT flag.
 config HPET
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 777bc499bbbd..2a36561eec68 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1973,10 +1973,6 @@ static _INLINE_ void show_serial_version(void)
 }
-int register_serial(struct serial_struct *req);
-void unregister_serial(int line);
 static struct tty_operations serial_ops = {
        .open = rs_open,
        .close = rs_close,
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 6bf2e27dc23a..11f9ee581124 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -599,7 +599,7 @@ static ssize_t ac_read (struct file *filp, char __user *buf, size_t count, loff_
 #ifdef DEBUG
                if (loopcount++ > 2) {
-                        printk("Looping in ac_read. loopcount %d\n", loopcount);
+                        printk(KERN_DEBUG "Looping in ac_read. loopcount %d\n", loopcount);
                }
 #endif
        } 
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index d9a029934678..c2b12eab67c9 100644
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -6,7 +6,7 @@
 #
 config DRM
        tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
-        depends on AGP || AGP=n
+        depends on (AGP || AGP=n) && PCI
        help
          Kernel-level support for the Direct Rendering Infrastructure (DRI)
          introduced in XFree86 4.0. If you say Y here, you need to select
diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
index 23ab26321e9a..7444dec40b94 100644
--- a/drivers/char/drm/Makefile
+++ b/drivers/char/drm/Makefile
@@ -19,6 +19,11 @@ radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
 ffb-objs    := ffb_drv.o ffb_context.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
+ifeq ($(CONFIG_COMPAT),y)
+drm-objs    += drm_ioc32.o
+radeon-objs += radeon_ioc32.o
+endif
 obj-$(CONFIG_DRM)       += drm.o
 obj-$(CONFIG_DRM_GAMMA) += gamma.o
 obj-$(CONFIG_DRM_TDFX)  += tdfx.o
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 21f4c54e1a8d..b04ddf12a0ff 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -316,6 +316,9 @@ do {									\
 typedef int drm_ioctl_t( struct inode *inode, struct file *filp,
                         unsigned int cmd, unsigned long arg );
+typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
+                               unsigned long arg);
 typedef struct drm_ioctl_desc {
        drm_ioctl_t          *func;
        int                  auth_needed;
@@ -775,6 +778,8 @@ extern int           drm_version(struct inode *inode, struct file *filp,
                                  unsigned int cmd, unsigned long arg);
 extern int           drm_ioctl(struct inode *inode, struct file *filp,
                                unsigned int cmd, unsigned long arg);
+extern long          drm_compat_ioctl(struct file *filp,
+                                unsigned int cmd, unsigned long arg);
 extern int           drm_takedown(drm_device_t * dev);
                                /* Device support (drm_fops.h) */
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 4113bcba67fe..3407380b865a 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -60,6 +60,15 @@ int drm_order( unsigned long size )
 }
 EXPORT_SYMBOL(drm_order);
+#ifdef CONFIG_COMPAT
+/*
+ * Used to allocate 32-bit handles for _DRM_SHM regions
+ * The 0x10000000 value is chosen to be out of the way of
+ * FB/register and GART physical addresses.
+ */
+static unsigned int map32_handle = 0x10000000;
+#endif
 /**
 * Ioctl to specify a range of memory that is available for mapping by a non-root process.
 *
@@ -187,16 +196,18 @@ int drm_addmap( struct inode *inode, struct file *filp,
        down(&dev->struct_sem);
        list_add(&list->head, &dev->maplist->head);
+#ifdef CONFIG_COMPAT
+        /* Assign a 32-bit handle for _DRM_SHM mappings */
+        /* We do it here so that dev->struct_sem protects the increment */
+        if (map->type == _DRM_SHM)
+                map->offset = map32_handle += PAGE_SIZE;
+#endif
        up(&dev->struct_sem);
        if ( copy_to_user( argp, map, sizeof(*map) ) )
                return -EFAULT;
-        if ( map->type != _DRM_SHM ) {
+        if (copy_to_user(&argp->handle, &map->offset, sizeof(map->offset)))
-                if ( copy_to_user( &argp->handle,
+                return -EFAULT;
-                                   &map->offset,
-                                   sizeof(map->offset) ) )
-                        return -EFAULT;
-        }
        return 0;
 }
@@ -240,7 +251,7 @@ int drm_rmmap(struct inode *inode, struct file *filp,
                r_list = list_entry(list, drm_map_list_t, head);
                if(r_list->map &&
-                   r_list->map->handle == request.handle &&
+                   r_list->map->offset == (unsigned long) request.handle &&
                   r_list->map->flags & _DRM_REMOVABLE) break;
        }
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index f15c86c57875..fdf661f234ed 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -225,7 +225,7 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
        map = dev->context_sareas[request.ctx_id];
        up(&dev->struct_sem);
-        request.handle = map->handle;
+        request.handle = (void *) map->offset;
        if (copy_to_user(argp, &request, sizeof(request)))
                return -EFAULT;
        return 0;
@@ -261,8 +261,8 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
        down(&dev->struct_sem);
        list_for_each(list, &dev->maplist->head) {
                r_list = list_entry(list, drm_map_list_t, head);
-                if(r_list->map &&
+                if (r_list->map
-                   r_list->map->handle == request.handle)
+                    && r_list->map->offset == (unsigned long) request.handle)
                        goto found;
        }
 bad:
diff --git a/drivers/char/drm/drm_ioc32.c b/drivers/char/drm/drm_ioc32.c
new file mode 100644
index 000000000000..8087a9636399
--- /dev/null
+++ b/drivers/char/drm/drm_ioc32.c
@@ -0,0 +1,1069 @@
+/**
+ * \file drm_ioc32.c
+ *
+ * 32-bit ioctl compatibility routines for the DRM.
+ *
+ * \author Paul Mackerras <paulus@samba.org>
+ *
+ * Copyright (C) Paul Mackerras 2005.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#include <linux/compat.h>
+#include <linux/ioctl32.h>
+#include "drmP.h"
+#include "drm_core.h"
+#define DRM_IOCTL_VERSION32             DRM_IOWR(0x00, drm_version32_t)
+#define DRM_IOCTL_GET_UNIQUE32          DRM_IOWR(0x01, drm_unique32_t)
+#define DRM_IOCTL_GET_MAP32             DRM_IOWR(0x04, drm_map32_t)
+#define DRM_IOCTL_GET_CLIENT32          DRM_IOWR(0x05, drm_client32_t)
+#define DRM_IOCTL_GET_STATS32           DRM_IOR( 0x06, drm_stats32_t)
+#define DRM_IOCTL_SET_UNIQUE32          DRM_IOW( 0x10, drm_unique32_t)
+#define DRM_IOCTL_ADD_MAP32             DRM_IOWR(0x15, drm_map32_t)
+#define DRM_IOCTL_ADD_BUFS32            DRM_IOWR(0x16, drm_buf_desc32_t)
+#define DRM_IOCTL_MARK_BUFS32           DRM_IOW( 0x17, drm_buf_desc32_t)
+#define DRM_IOCTL_INFO_BUFS32           DRM_IOWR(0x18, drm_buf_info32_t)
+#define DRM_IOCTL_MAP_BUFS32            DRM_IOWR(0x19, drm_buf_map32_t)
+#define DRM_IOCTL_FREE_BUFS32           DRM_IOW( 0x1a, drm_buf_free32_t)
+#define DRM_IOCTL_RM_MAP32              DRM_IOW( 0x1b, drm_map32_t)
+#define DRM_IOCTL_SET_SAREA_CTX32       DRM_IOW( 0x1c, drm_ctx_priv_map32_t)
+#define DRM_IOCTL_GET_SAREA_CTX32       DRM_IOWR(0x1d, drm_ctx_priv_map32_t)
+#define DRM_IOCTL_RES_CTX32             DRM_IOWR(0x26, drm_ctx_res32_t)
+#define DRM_IOCTL_DMA32                 DRM_IOWR(0x29, drm_dma32_t)
+#define DRM_IOCTL_AGP_ENABLE32          DRM_IOW( 0x32, drm_agp_mode32_t)
+#define DRM_IOCTL_AGP_INFO32            DRM_IOR( 0x33, drm_agp_info32_t)
+#define DRM_IOCTL_AGP_ALLOC32           DRM_IOWR(0x34, drm_agp_buffer32_t)
+#define DRM_IOCTL_AGP_FREE32            DRM_IOW( 0x35, drm_agp_buffer32_t)
+#define DRM_IOCTL_AGP_BIND32            DRM_IOW( 0x36, drm_agp_binding32_t)
+#define DRM_IOCTL_AGP_UNBIND32          DRM_IOW( 0x37, drm_agp_binding32_t)
+#define DRM_IOCTL_SG_ALLOC32            DRM_IOW( 0x38, drm_scatter_gather32_t)
+#define DRM_IOCTL_SG_FREE32             DRM_IOW( 0x39, drm_scatter_gather32_t)
+#define DRM_IOCTL_WAIT_VBLANK32         DRM_IOWR(0x3a, drm_wait_vblank32_t)
+typedef struct drm_version_32 {
+        int     version_major;    /**< Major version */
+        int     version_minor;    /**< Minor version */
+        int     version_patchlevel;/**< Patch level */
+        u32     name_len;         /**< Length of name buffer */
+        u32     name;             /**< Name of driver */
+        u32     date_len;         /**< Length of date buffer */
+        u32     date;             /**< User-space buffer to hold date */
+        u32     desc_len;         /**< Length of desc buffer */
+        u32     desc;             /**< User-space buffer to hold desc */
+} drm_version32_t;
+static int compat_drm_version(struct file *file, unsigned int cmd,
+                              unsigned long arg)
+{
+        drm_version32_t v32;
+        drm_version_t __user *version;
+        int err;
+        if (copy_from_user(&v32, (void __user *) arg, sizeof(v32)))
+                return -EFAULT;
+        version = compat_alloc_user_space(sizeof(*version));
+        if (!access_ok(VERIFY_WRITE, version, sizeof(*version)))
+                return -EFAULT;
+        if (__put_user(v32.name_len, &version->name_len)
+            || __put_user((void __user *)(unsigned long)v32.name,
+                          &version->name)
+            || __put_user(v32.date_len, &version->date_len)
+            || __put_user((void __user *)(unsigned long)v32.date,
+                          &version->date)
+            || __put_user(v32.desc_len, &version->desc_len)
+            || __put_user((void __user *)(unsigned long)v32.desc,
+                          &version->desc))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_VERSION, (unsigned long) version);
+        if (err)
+                return err;
+        if (__get_user(v32.version_major, &version->version_major)
+            || __get_user(v32.version_minor, &version->version_minor)
+            || __get_user(v32.version_patchlevel, &version->version_patchlevel)
+            || __get_user(v32.name_len, &version->name_len)
+            || __get_user(v32.date_len, &version->date_len)
+            || __get_user(v32.desc_len, &version->desc_len))
+                return -EFAULT;
+        if (copy_to_user((void __user *) arg, &v32, sizeof(v32)))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_unique32 {
+        u32 unique_len; /**< Length of unique */
+        u32 unique;     /**< Unique name for driver instantiation */
+} drm_unique32_t;
+static int compat_drm_getunique(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        drm_unique32_t uq32;
+        drm_unique_t __user *u;
+        int err;
+        if (copy_from_user(&uq32, (void __user *) arg, sizeof(uq32)))
+                return -EFAULT;
+        u = compat_alloc_user_space(sizeof(*u));
+        if (!access_ok(VERIFY_WRITE, u, sizeof(*u)))
+                return -EFAULT;
+        if (__put_user(uq32.unique_len, &u->unique_len)
+            || __put_user((void __user *)(unsigned long) uq32.unique,
+                          &u->unique))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_GET_UNIQUE, (unsigned long) u);
+        if (err)
+                return err;
+        if (__get_user(uq32.unique_len, &u->unique_len))
+                return -EFAULT;
+        if (copy_to_user((void __user *) arg, &uq32, sizeof(uq32)))
+                return -EFAULT;
+        return 0;
+}
+static int compat_drm_setunique(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        drm_unique32_t uq32;
+        drm_unique_t __user *u;
+        if (copy_from_user(&uq32, (void __user *) arg, sizeof(uq32)))
+                return -EFAULT;
+        u = compat_alloc_user_space(sizeof(*u));
+        if (!access_ok(VERIFY_WRITE, u, sizeof(*u)))
+                return -EFAULT;
+        if (__put_user(uq32.unique_len, &u->unique_len)
+            || __put_user((void __user *)(unsigned long) uq32.unique,
+                          &u->unique))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_SET_UNIQUE, (unsigned long) u);
+}
+typedef struct drm_map32 {
+        u32     offset;         /**< Requested physical address (0 for SAREA)*/
+        u32     size;           /**< Requested physical size (bytes) */
+        drm_map_type_t  type;   /**< Type of memory to map */
+        drm_map_flags_t flags;  /**< Flags */
+        u32     handle;         /**< User-space: "Handle" to pass to mmap() */
+        int     mtrr;           /**< MTRR slot used */
+} drm_map32_t;
+static int compat_drm_getmap(struct file *file, unsigned int cmd,
+                             unsigned long arg)
+{
+        drm_map32_t __user *argp = (void __user *)arg;
+        drm_map32_t m32;
+        drm_map_t __user *map;
+        int idx, err;
+        void *handle;
+        if (get_user(idx, &argp->offset))
+                return -EFAULT;
+        map = compat_alloc_user_space(sizeof(*map));
+        if (!access_ok(VERIFY_WRITE, map, sizeof(*map)))
+                return -EFAULT;
+        if (__put_user(idx, &map->offset))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_GET_MAP, (unsigned long) map);
+        if (err)
+                return err;
+        if (__get_user(m32.offset, &map->offset)
+            || __get_user(m32.size, &map->size)
+            || __get_user(m32.type, &map->type)
+            || __get_user(m32.flags, &map->flags)
+            || __get_user(handle, &map->handle)
+            || __get_user(m32.mtrr, &map->mtrr))
+                return -EFAULT;
+        m32.handle = (unsigned long) handle;
+        if (copy_to_user(argp, &m32, sizeof(m32)))
+                return -EFAULT;
+        return 0;
+}
+static int compat_drm_addmap(struct file *file, unsigned int cmd,
+                             unsigned long arg)
+{
+        drm_map32_t __user *argp = (void __user *)arg;
+        drm_map32_t m32;
+        drm_map_t __user *map;
+        int err;
+        void *handle;
+        if (copy_from_user(&m32, argp, sizeof(m32)))
+                return -EFAULT;
+        map = compat_alloc_user_space(sizeof(*map));
+        if (!access_ok(VERIFY_WRITE, map, sizeof(*map)))
+                return -EFAULT;
+        if (__put_user(m32.offset, &map->offset)
+            || __put_user(m32.size, &map->size)
+            || __put_user(m32.type, &map->type)
+            || __put_user(m32.flags, &map->flags))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_ADD_MAP, (unsigned long) map);
+        if (err)
+                return err;
+        if (__get_user(m32.offset, &map->offset)
+            || __get_user(m32.mtrr, &map->mtrr)
+            || __get_user(handle, &map->handle))
+                return -EFAULT;
+        m32.handle = (unsigned long) handle;
+        if (m32.handle != (unsigned long) handle && printk_ratelimit())
+                printk(KERN_ERR "compat_drm_addmap truncated handle"
+                       " %p for type %d offset %x\n",
+                       handle, m32.type, m32.offset);
+        if (copy_to_user(argp, &m32, sizeof(m32)))
+                return -EFAULT;
+        return 0;
+}
+static int compat_drm_rmmap(struct file *file, unsigned int cmd,
+                            unsigned long arg)
+{
+        drm_map32_t __user *argp = (void __user *)arg;
+        drm_map_t __user *map;
+        u32 handle;
+        if (get_user(handle, &argp->handle))
+                return -EFAULT;
+        map = compat_alloc_user_space(sizeof(*map));
+        if (!access_ok(VERIFY_WRITE, map, sizeof(*map)))
+                return -EFAULT;
+        if (__put_user((void *)(unsigned long) handle, &map->handle))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RM_MAP, (unsigned long) map);
+}
+typedef struct drm_client32 {
+        int     idx;    /**< Which client desired? */
+        int     auth;   /**< Is client authenticated? */
+        u32     pid;    /**< Process ID */
+        u32     uid;    /**< User ID */
+        u32     magic;  /**< Magic */
+        u32     iocs;   /**< Ioctl count */
+} drm_client32_t;
+static int compat_drm_getclient(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        drm_client32_t c32;
+        drm_client32_t __user *argp = (void __user *)arg;
+        drm_client_t __user *client;
+        int idx, err;
+        if (get_user(idx, &argp->idx))
+                return -EFAULT;
+        client = compat_alloc_user_space(sizeof(*client));
+        if (!access_ok(VERIFY_WRITE, client, sizeof(*client)))
+                return -EFAULT;
+        if (__put_user(idx, &client->idx))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_GET_CLIENT, (unsigned long) client);
+        if (err)
+                return err;
+        if (__get_user(c32.auth, &client->auth)
+            || __get_user(c32.pid, &client->pid)
+            || __get_user(c32.uid, &client->uid)
+            || __get_user(c32.magic, &client->magic)
+            || __get_user(c32.iocs, &client->iocs))
+                return -EFAULT;
+        if (copy_to_user(argp, &c32, sizeof(c32)))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_stats32 {
+        u32 count;
+        struct {
+                u32 value;
+                drm_stat_type_t type;
+        } data[15];
+} drm_stats32_t;
+static int compat_drm_getstats(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_stats32_t s32;
+        drm_stats32_t __user *argp = (void __user *)arg;
+        drm_stats_t __user *stats;
+        int i, err;
+        stats = compat_alloc_user_space(sizeof(*stats));
+        if (!access_ok(VERIFY_WRITE, stats, sizeof(*stats)))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_GET_STATS, (unsigned long) stats);
+        if (err)
+                return err;
+        if (__get_user(s32.count, &stats->count))
+                return -EFAULT;
+        for (i = 0; i < 15; ++i)
+                if (__get_user(s32.data[i].value, &stats->data[i].value)
+                    || __get_user(s32.data[i].type, &stats->data[i].type))
+                        return -EFAULT;
+        if (copy_to_user(argp, &s32, sizeof(s32)))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_buf_desc32 {
+        int           count;     /**< Number of buffers of this size */
+        int           size;      /**< Size in bytes */
+        int           low_mark;  /**< Low water mark */
+        int           high_mark; /**< High water mark */
+        int           flags;
+        u32           agp_start; /**< Start address in the AGP aperture */
+} drm_buf_desc32_t;
+static int compat_drm_addbufs(struct file *file, unsigned int cmd,
+                              unsigned long arg)
+{
+        drm_buf_desc32_t __user *argp = (void __user *)arg;
+        drm_buf_desc_t __user *buf;
+        int err;
+        unsigned long agp_start;
+        buf = compat_alloc_user_space(sizeof(*buf));
+        if (!access_ok(VERIFY_WRITE, buf, sizeof(*buf))
+            || !access_ok(VERIFY_WRITE, argp, sizeof(*argp)))
+                return -EFAULT;
+        if (__copy_in_user(buf, argp, offsetof(drm_buf_desc32_t, agp_start))
+            || __get_user(agp_start, &argp->agp_start)
+            || __put_user(agp_start, &buf->agp_start))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_ADD_BUFS, (unsigned long) buf);
+        if (err)
+                return err;
+        if (__copy_in_user(argp, buf, offsetof(drm_buf_desc32_t, agp_start))
+            || __get_user(agp_start, &buf->agp_start)
+            || __put_user(agp_start, &argp->agp_start))
+                return -EFAULT;
+        return 0;
+}
+static int compat_drm_markbufs(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_buf_desc32_t b32;
+        drm_buf_desc32_t __user *argp = (void __user *)arg;
+        drm_buf_desc_t __user *buf;
+        if (copy_from_user(&b32, argp, sizeof(b32)))
+                return -EFAULT;
+        buf = compat_alloc_user_space(sizeof(*buf));
+        if (!access_ok(VERIFY_WRITE, buf, sizeof(*buf)))
+                return -EFAULT;
+        if (__put_user(b32.size, &buf->size)
+            || __put_user(b32.low_mark, &buf->low_mark)
+            || __put_user(b32.high_mark, &buf->high_mark))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_MARK_BUFS, (unsigned long) buf);
+}
+typedef struct drm_buf_info32 {
+        int            count;   /**< Entries in list */
+        u32            list;
+} drm_buf_info32_t;
+static int compat_drm_infobufs(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_buf_info32_t req32;
+        drm_buf_info32_t __user *argp = (void __user *)arg;
+        drm_buf_desc32_t __user *to;
+        drm_buf_info_t __user *request;
+        drm_buf_desc_t __user *list;
+        size_t nbytes;
+        int i, err;
+        int count, actual;
+        if (copy_from_user(&req32, argp, sizeof(req32)))
+                return -EFAULT;
+        count = req32.count;
+        to = (drm_buf_desc32_t __user *)(unsigned long) req32.list;
+        if (count < 0)
+                count = 0;
+        if (count > 0
+            && !access_ok(VERIFY_WRITE, to, count * sizeof(drm_buf_desc32_t)))
+                return -EFAULT;
+        nbytes = sizeof(*request) + count * sizeof(drm_buf_desc_t);
+        request = compat_alloc_user_space(nbytes);
+        if (!access_ok(VERIFY_WRITE, request, nbytes))
+                return -EFAULT;
+        list = (drm_buf_desc_t *) (request + 1);
+        if (__put_user(count, &request->count)
+            || __put_user(list, &request->list))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_INFO_BUFS, (unsigned long) request);
+        if (err)
+                return err;
+        if (__get_user(actual, &request->count))
+                return -EFAULT;
+        if (count >= actual)
+                for (i = 0; i < actual; ++i)
+                        if (__copy_in_user(&to[i], &list[i],
+                                           offsetof(drm_buf_desc_t, flags)))
+                                return -EFAULT;
+        if (__put_user(actual, &argp->count))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_buf_pub32 {
+        int     idx;            /**< Index into the master buffer list */
+        int     total;          /**< Buffer size */
+        int     used;           /**< Amount of buffer in use (for DMA) */
+        u32     address;        /**< Address of buffer */
+} drm_buf_pub32_t;
+typedef struct drm_buf_map32 {
+        int     count;          /**< Length of the buffer list */
+        u32     virtual;        /**< Mmap'd area in user-virtual */
+        u32     list;           /**< Buffer information */
+} drm_buf_map32_t;
+static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
+                              unsigned long arg)
+{
+        drm_buf_map32_t __user *argp = (void __user *)arg;
+        drm_buf_map32_t req32;
+        drm_buf_pub32_t __user *list32;
+        drm_buf_map_t __user *request;
+        drm_buf_pub_t __user *list;
+        int i, err;
+        int count, actual;
+        size_t nbytes;
+        void __user *addr;
+        if (copy_from_user(&req32, argp, sizeof(req32)))
+                return -EFAULT;
+        count = req32.count;
+        list32 = (void __user *)(unsigned long)req32.list;
+        if (count < 0)
+                return -EINVAL;
+        nbytes = sizeof(*request) + count * sizeof(drm_buf_pub_t);
+        request = compat_alloc_user_space(nbytes);
+        if (!access_ok(VERIFY_WRITE, request, nbytes))
+                return -EFAULT;
+        list = (drm_buf_pub_t *) (request + 1);
+        if (__put_user(count, &request->count)
+            || __put_user(list, &request->list))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_MAP_BUFS, (unsigned long) request);
+        if (err)
+                return err;
+        if (__get_user(actual, &request->count))
+                return -EFAULT;
+        if (count >= actual)
+                for (i = 0; i < actual; ++i)
+                        if (__copy_in_user(&list32[i], &list[i],
+                                           offsetof(drm_buf_pub_t, address))
+                            || __get_user(addr, &list[i].address)
+                            || __put_user((unsigned long) addr,
+                                          &list32[i].address))
+                                return -EFAULT;
+        if (__put_user(actual, &argp->count)
+            || __get_user(addr, &request->virtual)
+            || __put_user((unsigned long) addr, &argp->virtual))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_buf_free32 {
+        int     count;
+        u32     list;
+} drm_buf_free32_t;
+static int compat_drm_freebufs(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_buf_free32_t req32;
+        drm_buf_free_t __user *request;
+        drm_buf_free32_t __user *argp = (void __user *)arg;
+        if (copy_from_user(&req32, argp, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request)))
+                return -EFAULT;
+        if (__put_user(req32.count, &request->count)
+            || __put_user((int __user *)(unsigned long) req32.list,
+                          &request->list))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_FREE_BUFS, (unsigned long) request);
+}
+typedef struct drm_ctx_priv_map32 {
+        unsigned int    ctx_id;  /**< Context requesting private mapping */
+        u32             handle; /**< Handle of map */
+} drm_ctx_priv_map32_t;
+static int compat_drm_setsareactx(struct file *file, unsigned int cmd,
+                                  unsigned long arg)
+{
+        drm_ctx_priv_map32_t req32;
+        drm_ctx_priv_map_t __user *request;
+        drm_ctx_priv_map32_t __user *argp = (void __user *)arg;
+        if (copy_from_user(&req32, argp, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request)))
+                return -EFAULT;
+        if (__put_user(req32.ctx_id, &request->ctx_id)
+            || __put_user((void *)(unsigned long) req32.handle,
+                          &request->handle))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_SET_SAREA_CTX, (unsigned long) request);
+}
+static int compat_drm_getsareactx(struct file *file, unsigned int cmd,
+                                  unsigned long arg)
+{
+        drm_ctx_priv_map_t __user *request;
+        drm_ctx_priv_map32_t __user *argp = (void __user *)arg;
+        int err;
+        unsigned int ctx_id;
+        void *handle;
+        if (!access_ok(VERIFY_WRITE, argp, sizeof(*argp))
+            || __get_user(ctx_id, &argp->ctx_id))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request)))
+                return -EFAULT;
+        if (__put_user(ctx_id, &request->ctx_id))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_GET_SAREA_CTX, (unsigned long) request);
+        if (err)
+                return err;
+        if (__get_user(handle, &request->handle)
+            || __put_user((unsigned long) handle, &argp->handle))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_ctx_res32 {
+        int     count;
+        u32     contexts;
+} drm_ctx_res32_t;
+static int compat_drm_resctx(struct file *file, unsigned int cmd,
+                             unsigned long arg)
+{
+        drm_ctx_res32_t __user *argp = (void __user *)arg;
+        drm_ctx_res32_t res32;
+        drm_ctx_res_t __user *res;
+        int err;
+        if (copy_from_user(&res32, argp, sizeof(res32)))
+                return -EFAULT;
+        res = compat_alloc_user_space(sizeof(*res));
+        if (!access_ok(VERIFY_WRITE, res, sizeof(*res)))
+                return -EFAULT;
+        if (__put_user(res32.count, &res->count)
+            || __put_user((drm_ctx_t __user *)(unsigned long) res32.contexts,
+                          &res->contexts))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_RES_CTX, (unsigned long) res);
+        if (err)
+                return err;
+        if (__get_user(res32.count, &res->count)
+            || __put_user(res32.count, &argp->count))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_dma32 {
+        int     context;          /**< Context handle */
+        int     send_count;       /**< Number of buffers to send */
+        u32     send_indices;     /**< List of handles to buffers */
+        u32     send_sizes;       /**< Lengths of data to send */
+        drm_dma_flags_t flags;            /**< Flags */
+        int     request_count;    /**< Number of buffers requested */
+        int     request_size;     /**< Desired size for buffers */
+        u32     request_indices;  /**< Buffer information */
+        u32     request_sizes;
+        int     granted_count;    /**< Number of buffers granted */
+} drm_dma32_t;
+static int compat_drm_dma(struct file *file, unsigned int cmd,
+                          unsigned long arg)
+{
+        drm_dma32_t d32;
+        drm_dma32_t __user *argp = (void __user *) arg;
+        drm_dma_t __user *d;
+        int err;
+        if (copy_from_user(&d32, argp, sizeof(d32)))
+                return -EFAULT;
+        d = compat_alloc_user_space(sizeof(*d));
+        if (!access_ok(VERIFY_WRITE, d, sizeof(*d)))
+                return -EFAULT;
+        if (__put_user(d32.context, &d->context)
+            || __put_user(d32.send_count, &d->send_count)
+            || __put_user((int __user *)(unsigned long) d32.send_indices,
+                          &d->send_indices)
+            || __put_user((int __user *)(unsigned long) d32.send_sizes,
+                          &d->send_sizes)
+            || __put_user(d32.flags, &d->flags)
+            || __put_user(d32.request_count, &d->request_count)
+            || __put_user((int __user *)(unsigned long) d32.request_indices,
+                          &d->request_indices)
+            || __put_user((int __user *)(unsigned long) d32.request_sizes,
+                          &d->request_sizes))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_DMA, (unsigned long) d);
+        if (err)
+                return err;
+        if (__get_user(d32.request_size, &d->request_size)
+            || __get_user(d32.granted_count, &d->granted_count)
+            || __put_user(d32.request_size, &argp->request_size)
+            || __put_user(d32.granted_count, &argp->granted_count))
+                return -EFAULT;
+        return 0;
+}
+#if __OS_HAS_AGP
+typedef struct drm_agp_mode32 {
+        u32 mode;       /**< AGP mode */
+} drm_agp_mode32_t;
+static int compat_drm_agp_enable(struct file *file, unsigned int cmd,
+                                 unsigned long arg)
+{
+        drm_agp_mode32_t __user *argp = (void __user *)arg;
+        drm_agp_mode32_t m32;
+        drm_agp_mode_t __user *mode;
+        if (get_user(m32.mode, &argp->mode))
+                return -EFAULT;
+        mode = compat_alloc_user_space(sizeof(*mode));
+        if (put_user(m32.mode, &mode->mode))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_AGP_ENABLE, (unsigned long) mode);
+}
+typedef struct drm_agp_info32 {
+        int       agp_version_major;
+        int       agp_version_minor;
+        u32       mode;
+        u32       aperture_base;  /* physical address */
+        u32       aperture_size;  /* bytes */
+        u32       memory_allowed; /* bytes */
+        u32       memory_used;
+                                /* PCI information */
+        unsigned short id_vendor;
+        unsigned short id_device;
+} drm_agp_info32_t;
+static int compat_drm_agp_info(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_agp_info32_t __user *argp = (void __user *)arg;
+        drm_agp_info32_t i32;
+        drm_agp_info_t __user *info;
+        int err;
+        info = compat_alloc_user_space(sizeof(*info));
+        if (!access_ok(VERIFY_WRITE, info, sizeof(*info)))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_AGP_INFO, (unsigned long) info);
+        if (err)
+                return err;
+        if (__get_user(i32.agp_version_major, &info->agp_version_major)
+            || __get_user(i32.agp_version_minor, &info->agp_version_minor)
+            || __get_user(i32.mode, &info->mode)
+            || __get_user(i32.aperture_base, &info->aperture_base)
+            || __get_user(i32.aperture_size, &info->aperture_size)
+            || __get_user(i32.memory_allowed, &info->memory_allowed)
+            || __get_user(i32.memory_used, &info->memory_used)
+            || __get_user(i32.id_vendor, &info->id_vendor)
+            || __get_user(i32.id_device, &info->id_device))
+                return -EFAULT;
+        if (copy_to_user(argp, &i32, sizeof(i32)))
+                return -EFAULT;
+        return 0;
+}
+typedef struct drm_agp_buffer32 {
+        u32 size;       /**< In bytes -- will round to page boundary */
+        u32 handle;     /**< Used for binding / unbinding */
+        u32 type;       /**< Type of memory to allocate */
+        u32 physical;   /**< Physical used by i810 */
+} drm_agp_buffer32_t;
+static int compat_drm_agp_alloc(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        drm_agp_buffer32_t __user *argp = (void __user *)arg;
+        drm_agp_buffer32_t req32;
+        drm_agp_buffer_t __user *request;
+        int err;
+        if (copy_from_user(&req32, argp, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.size, &request->size)
+            || __put_user(req32.type, &request->type))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_AGP_ALLOC, (unsigned long) request);
+        if (err)
+                return err;
+        if (__get_user(req32.handle, &request->handle)
+            || __get_user(req32.physical, &request->physical)
+            || copy_to_user(argp, &req32, sizeof(req32))) {
+                drm_ioctl(file->f_dentry->d_inode, file,
+                          DRM_IOCTL_AGP_FREE, (unsigned long) request);
+                return -EFAULT;
+        }
+        return 0;
+}
+static int compat_drm_agp_free(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_agp_buffer32_t __user *argp = (void __user *)arg;
+        drm_agp_buffer_t __user *request;
+        u32 handle;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || get_user(handle, &argp->handle)
+            || __put_user(handle, &request->handle))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_AGP_FREE, (unsigned long) request);
+}
+typedef struct drm_agp_binding32 {
+        u32 handle;     /**< From drm_agp_buffer */
+        u32 offset;     /**< In bytes -- will round to page boundary */
+} drm_agp_binding32_t;
+static int compat_drm_agp_bind(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_agp_binding32_t __user *argp = (void __user *)arg;
+        drm_agp_binding32_t req32;
+        drm_agp_binding_t __user *request;
+        if (copy_from_user(&req32, argp, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.handle, &request->handle)
+            || __put_user(req32.offset, &request->offset))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_AGP_BIND, (unsigned long) request);
+}
+static int compat_drm_agp_unbind(struct file *file, unsigned int cmd,
+                                 unsigned long arg)
+{
+        drm_agp_binding32_t __user *argp = (void __user *)arg;
+        drm_agp_binding_t __user *request;
+        u32 handle;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || get_user(handle, &argp->handle)
+            || __put_user(handle, &request->handle))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_AGP_UNBIND, (unsigned long) request);
+}
+#endif /* __OS_HAS_AGP */
+typedef struct drm_scatter_gather32 {
+        u32 size;       /**< In bytes -- will round to page boundary */
+        u32 handle;     /**< Used for mapping / unmapping */
+} drm_scatter_gather32_t;
+static int compat_drm_sg_alloc(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        drm_scatter_gather32_t __user *argp = (void __user *)arg;
+        drm_scatter_gather_t __user *request;
+        int err;
+        unsigned long x;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || !access_ok(VERIFY_WRITE, argp, sizeof(*argp))
+            || __get_user(x, &argp->size)
+            || __put_user(x, &request->size))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_SG_ALLOC, (unsigned long) request);
+        if (err)
+                return err;
+        /* XXX not sure about the handle conversion here... */
+        if (__get_user(x, &request->handle)
+            || __put_user(x >> PAGE_SHIFT, &argp->handle))
+                return -EFAULT;
+        return 0;
+}
+static int compat_drm_sg_free(struct file *file, unsigned int cmd,
+                              unsigned long arg)
+{
+        drm_scatter_gather32_t __user *argp = (void __user *)arg;
+        drm_scatter_gather_t __user *request;
+        unsigned long x;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || !access_ok(VERIFY_WRITE, argp, sizeof(*argp))
+            || __get_user(x, &argp->handle)
+            || __put_user(x << PAGE_SHIFT, &request->handle))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_SG_FREE, (unsigned long) request);
+}
+struct drm_wait_vblank_request32 {
+        drm_vblank_seq_type_t type;
+        unsigned int sequence;
+        u32 signal;
+};
+struct drm_wait_vblank_reply32 {
+        drm_vblank_seq_type_t type;
+        unsigned int sequence;
+        s32 tval_sec;
+        s32 tval_usec;
+};
+typedef union drm_wait_vblank32 {
+        struct drm_wait_vblank_request32 request;
+        struct drm_wait_vblank_reply32 reply;
+} drm_wait_vblank32_t;
+static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
+                                  unsigned long arg)
+{
+        drm_wait_vblank32_t __user *argp = (void __user *)arg;
+        drm_wait_vblank32_t req32;
+        drm_wait_vblank_t __user *request;
+        int err;
+        if (copy_from_user(&req32, argp, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.request.type, &request->request.type)
+            || __put_user(req32.request.sequence, &request->request.sequence)
+            || __put_user(req32.request.signal, &request->request.signal))
+                return -EFAULT;
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_WAIT_VBLANK, (unsigned long) request);
+        if (err)
+                return err;
+        if (__get_user(req32.reply.type, &request->reply.type)
+            || __get_user(req32.reply.sequence, &request->reply.sequence)
+            || __get_user(req32.reply.tval_sec, &request->reply.tval_sec)
+            || __get_user(req32.reply.tval_usec, &request->reply.tval_usec))
+                return -EFAULT;
+        if (copy_to_user(argp, &req32, sizeof(req32)))
+                return -EFAULT;
+        return 0;
+}
+drm_ioctl_compat_t *drm_compat_ioctls[] = {
+        [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
+        [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
+        [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
+        [DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT32)] = compat_drm_getclient,
+        [DRM_IOCTL_NR(DRM_IOCTL_GET_STATS32)] = compat_drm_getstats,
+        [DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE32)] = compat_drm_setunique,
+        [DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP32)] = compat_drm_addmap,
+        [DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS32)] = compat_drm_addbufs,
+        [DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS32)] = compat_drm_markbufs,
+        [DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS32)] = compat_drm_infobufs,
+        [DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS32)] = compat_drm_mapbufs,
+        [DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS32)] = compat_drm_freebufs,
+        [DRM_IOCTL_NR(DRM_IOCTL_RM_MAP32)] = compat_drm_rmmap,
+        [DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX32)] = compat_drm_setsareactx,
+        [DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX32)] = compat_drm_getsareactx,
+        [DRM_IOCTL_NR(DRM_IOCTL_RES_CTX32)] = compat_drm_resctx,
+        [DRM_IOCTL_NR(DRM_IOCTL_DMA32)] = compat_drm_dma,
+#if __OS_HAS_AGP
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE32)] = compat_drm_agp_enable,
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO32)] = compat_drm_agp_info,
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC32)] = compat_drm_agp_alloc,
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE32)] = compat_drm_agp_free,
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND32)] = compat_drm_agp_bind,
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND32)] = compat_drm_agp_unbind,
+#endif
+        [DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC32)] = compat_drm_sg_alloc,
+        [DRM_IOCTL_NR(DRM_IOCTL_SG_FREE32)] = compat_drm_sg_free,
+        [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)] = compat_drm_wait_vblank,
+};
+/**
+ * Called whenever a 32-bit process running under a 64-bit kernel
+ * performs an ioctl on /dev/drm.
+ *
+ * \param filp file pointer.
+ * \param cmd command.
+ * \param arg user argument.
+ * \return zero on success or negative number on failure.
+ */
+long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+        unsigned int nr = DRM_IOCTL_NR(cmd);
+        drm_ioctl_compat_t *fn;
+        int ret;
+        if (nr >= DRM_ARRAY_SIZE(drm_compat_ioctls))
+                return -ENOTTY;
+        fn = drm_compat_ioctls[nr];
+        lock_kernel();          /* XXX for now */
+        if (fn != NULL)
+                ret = (*fn)(filp, cmd, arg);
+        else
+                ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
+        unlock_kernel();
+        return ret;
+}
+EXPORT_SYMBOL(drm_compat_ioctl);
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 7300a09dbd5c..b5903f9f1423 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -1,10 +1,30 @@
 /* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
 */
 /**************************************************************************
- * 
+ *
 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
 * All Rights Reserved.
- * 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
 **************************************************************************/
 #include "drmP.h"
diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h
index 7e55edf45c4f..23e027d29080 100644
--- a/drivers/char/drm/i915_drm.h
+++ b/drivers/char/drm/i915_drm.h
@@ -1,3 +1,30 @@
+/**************************************************************************
+ *
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index 002b7082e21b..e6a9e1d1d283 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -1,11 +1,30 @@
 /* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
 */
 /**************************************************************************
- * 
+ *
 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
 * All Rights Reserved.
- * 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
 **************************************************************************/
 #include "drmP.h"
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index f6ca92a565db..fa940d64b85d 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -1,10 +1,30 @@
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
 */
 /**************************************************************************
- * 
+ *
 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
 * All Rights Reserved.
- * 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
 **************************************************************************/
 #ifndef _I915_DRV_H_
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index b0239262a84a..a101cc9cfd7e 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -1,10 +1,30 @@
 /* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
 */
 /**************************************************************************
- * 
+ *
 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
 * All Rights Reserved.
- * 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
 **************************************************************************/
 #include "drmP.h"
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index d54a3005946b..9b1698f521be 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -1,10 +1,30 @@
 /* i915_mem.c -- Simple agp/fb memory manager for i915 -*- linux-c -*-
 */
 /**************************************************************************
- * 
+ *
 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
 * All Rights Reserved.
- * 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
 **************************************************************************/
 #include "drmP.h"
diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c
index 7b983d96e53b..18e4e5b0952f 100644
--- a/drivers/char/drm/radeon_drv.c
+++ b/drivers/char/drm/radeon_drv.c
@@ -101,6 +101,9 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
+#ifdef CONFIG_COMPAT
+                .compat_ioctl = radeon_compat_ioctl,
+#endif
        },
        .pci_driver = {
                .name          = DRIVER_NAME,
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 5837098afae8..771aa80a5e8c 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -317,6 +317,9 @@ extern int radeon_preinit( struct drm_device *dev, unsigned long flags );
 extern int radeon_postinit( struct drm_device *dev, unsigned long flags );
 extern int radeon_postcleanup( struct drm_device *dev );
+extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
+                                unsigned long arg);
 /* Flags for stats.boxes
 */
 #define RADEON_BOX_DMA_IDLE      0x1
diff --git a/drivers/char/drm/radeon_ioc32.c b/drivers/char/drm/radeon_ioc32.c
new file mode 100644
index 000000000000..bfe612215fb3
--- /dev/null
+++ b/drivers/char/drm/radeon_ioc32.c
@@ -0,0 +1,395 @@
+/**
+ * \file radeon_ioc32.c
+ *
+ * 32-bit ioctl compatibility routines for the Radeon DRM.
+ *
+ * \author Paul Mackerras <paulus@samba.org>
+ *
+ * Copyright (C) Paul Mackerras 2005
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#include <linux/compat.h>
+#include <linux/ioctl32.h>
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+typedef struct drm_radeon_init32 {
+        int func;
+        u32 sarea_priv_offset;
+        int is_pci;
+        int cp_mode;
+        int gart_size;
+        int ring_size;
+        int usec_timeout;
+        unsigned int fb_bpp;
+        unsigned int front_offset, front_pitch;
+        unsigned int back_offset, back_pitch;
+        unsigned int depth_bpp;
+        unsigned int depth_offset, depth_pitch;
+        u32 fb_offset;
+        u32 mmio_offset;
+        u32 ring_offset;
+        u32 ring_rptr_offset;
+        u32 buffers_offset;
+        u32 gart_textures_offset;
+} drm_radeon_init32_t;
+static int compat_radeon_cp_init(struct file *file, unsigned int cmd,
+                                 unsigned long arg)
+{
+        drm_radeon_init32_t init32;
+        drm_radeon_init_t __user *init;
+        if (copy_from_user(&init32, (void __user *)arg, sizeof(init32)))
+                return -EFAULT;
+        init = compat_alloc_user_space(sizeof(*init));
+        if (!access_ok(VERIFY_WRITE, init, sizeof(*init))
+            || __put_user(init32.func, &init->func)
+            || __put_user(init32.sarea_priv_offset, &init->sarea_priv_offset)
+            || __put_user(init32.is_pci, &init->is_pci)
+            || __put_user(init32.cp_mode, &init->cp_mode)
+            || __put_user(init32.gart_size, &init->gart_size)
+            || __put_user(init32.ring_size, &init->ring_size)
+            || __put_user(init32.usec_timeout, &init->usec_timeout)
+            || __put_user(init32.fb_bpp, &init->fb_bpp)
+            || __put_user(init32.front_offset, &init->front_offset)
+            || __put_user(init32.front_pitch, &init->front_pitch)
+            || __put_user(init32.back_offset, &init->back_offset)
+            || __put_user(init32.back_pitch, &init->back_pitch)
+            || __put_user(init32.depth_bpp, &init->depth_bpp)
+            || __put_user(init32.depth_offset, &init->depth_offset)
+            || __put_user(init32.depth_pitch, &init->depth_pitch)
+            || __put_user(init32.fb_offset, &init->fb_offset)
+            || __put_user(init32.mmio_offset, &init->mmio_offset)
+            || __put_user(init32.ring_offset, &init->ring_offset)
+            || __put_user(init32.ring_rptr_offset, &init->ring_rptr_offset)
+            || __put_user(init32.buffers_offset, &init->buffers_offset)
+            || __put_user(init32.gart_textures_offset,
+                          &init->gart_textures_offset))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_CP_INIT, (unsigned long) init);
+}
+typedef struct drm_radeon_clear32 {
+        unsigned int flags;
+        unsigned int clear_color;
+        unsigned int clear_depth;
+        unsigned int color_mask;
+        unsigned int depth_mask;   /* misnamed field:  should be stencil */
+        u32          depth_boxes;
+} drm_radeon_clear32_t;
+static int compat_radeon_cp_clear(struct file *file, unsigned int cmd,
+                                  unsigned long arg)
+{
+        drm_radeon_clear32_t clr32;
+        drm_radeon_clear_t __user *clr;
+        if (copy_from_user(&clr32, (void __user *)arg, sizeof(clr32)))
+                return -EFAULT;
+        clr = compat_alloc_user_space(sizeof(*clr));
+        if (!access_ok(VERIFY_WRITE, clr, sizeof(*clr))
+            || __put_user(clr32.flags, &clr->flags)
+            || __put_user(clr32.clear_color, &clr->clear_color)
+            || __put_user(clr32.clear_depth, &clr->clear_depth)
+            || __put_user(clr32.color_mask, &clr->color_mask)
+            || __put_user(clr32.depth_mask, &clr->depth_mask)
+            || __put_user((void __user *)(unsigned long)clr32.depth_boxes,
+                          &clr->depth_boxes))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_CLEAR, (unsigned long) clr);
+}
+typedef struct drm_radeon_stipple32 {
+        u32 mask;
+} drm_radeon_stipple32_t;
+static int compat_radeon_cp_stipple(struct file *file, unsigned int cmd,
+                                    unsigned long arg)
+{
+        drm_radeon_stipple32_t __user *argp = (void __user *) arg;
+        drm_radeon_stipple_t __user *request;
+        u32 mask;
+        if (get_user(mask, &argp->mask))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user((unsigned int __user *)(unsigned long) mask,
+                          &request->mask))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_STIPPLE, (unsigned long) request);
+}
+typedef struct drm_radeon_tex_image32 {
+        unsigned int x, y;              /* Blit coordinates */
+        unsigned int width, height;
+        u32 data;
+} drm_radeon_tex_image32_t;
+typedef struct drm_radeon_texture32 {
+        unsigned int offset;
+        int pitch;
+        int format;
+        int width;                      /* Texture image coordinates */
+        int height;
+        u32 image;
+} drm_radeon_texture32_t;
+static int compat_radeon_cp_texture(struct file *file, unsigned int cmd,
+                                    unsigned long arg)
+{
+        drm_radeon_texture32_t req32;
+        drm_radeon_texture_t __user *request;
+        drm_radeon_tex_image32_t img32;
+        drm_radeon_tex_image_t __user *image;
+        if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+                return -EFAULT;
+        if (req32.image == 0)
+                return -EINVAL;
+        if (copy_from_user(&img32, (void __user *)(unsigned long)req32.image,
+                           sizeof(img32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request) + sizeof(*image));
+        if (!access_ok(VERIFY_WRITE, request,
+                       sizeof(*request) + sizeof(*image)))
+                return -EFAULT;
+        image = (drm_radeon_tex_image_t __user *) (request + 1);
+        if (__put_user(req32.offset, &request->offset)
+            || __put_user(req32.pitch, &request->pitch)
+            || __put_user(req32.format, &request->format)
+            || __put_user(req32.width, &request->width)
+            || __put_user(req32.height, &request->height)
+            || __put_user(image, &request->image)
+            || __put_user(img32.x, &image->x)
+            || __put_user(img32.y, &image->y)
+            || __put_user(img32.width, &image->width)
+            || __put_user(img32.height, &image->height)
+            || __put_user((const void __user *)(unsigned long)img32.data,
+                          &image->data))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_TEXTURE, (unsigned long) request);
+}
+typedef struct drm_radeon_vertex2_32 {
+        int idx;                        /* Index of vertex buffer */
+        int discard;                    /* Client finished with buffer? */
+        int nr_states;
+        u32 state;
+        int nr_prims;
+        u32 prim;
+} drm_radeon_vertex2_32_t;
+static int compat_radeon_cp_vertex2(struct file *file, unsigned int cmd,
+                                    unsigned long arg)
+{
+        drm_radeon_vertex2_32_t req32;
+        drm_radeon_vertex2_t __user *request;
+        if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.idx, &request->idx)
+            || __put_user(req32.discard, &request->discard)
+            || __put_user(req32.nr_states, &request->nr_states)
+            || __put_user((void __user *)(unsigned long)req32.state,
+                          &request->state)
+            || __put_user(req32.nr_prims, &request->nr_prims)
+            || __put_user((void __user *)(unsigned long)req32.prim,
+                          &request->prim))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_VERTEX2, (unsigned long) request);
+}
+typedef struct drm_radeon_cmd_buffer32 {
+        int bufsz;
+        u32 buf;
+        int nbox;
+        u32 boxes;
+} drm_radeon_cmd_buffer32_t;
+static int compat_radeon_cp_cmdbuf(struct file *file, unsigned int cmd,
+                                   unsigned long arg)
+{
+        drm_radeon_cmd_buffer32_t req32;
+        drm_radeon_cmd_buffer_t __user *request;
+        if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.bufsz, &request->bufsz)
+            || __put_user((void __user *)(unsigned long)req32.buf,
+                          &request->buf)
+            || __put_user(req32.nbox, &request->nbox)
+            || __put_user((void __user *)(unsigned long)req32.boxes,
+                          &request->boxes))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_CMDBUF, (unsigned long) request);
+}
+typedef struct drm_radeon_getparam32 {
+        int param;
+        u32 value;
+} drm_radeon_getparam32_t;
+static int compat_radeon_cp_getparam(struct file *file, unsigned int cmd,
+                                     unsigned long arg)
+{
+        drm_radeon_getparam32_t req32;
+        drm_radeon_getparam_t __user *request;
+        if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.param, &request->param)
+            || __put_user((void __user *)(unsigned long)req32.value,
+                          &request->value))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_GETPARAM, (unsigned long) request);
+}
+typedef struct drm_radeon_mem_alloc32 {
+        int region;
+        int alignment;
+        int size;
+        u32 region_offset;      /* offset from start of fb or GART */
+} drm_radeon_mem_alloc32_t;
+static int compat_radeon_mem_alloc(struct file *file, unsigned int cmd,
+                                   unsigned long arg)
+{
+        drm_radeon_mem_alloc32_t req32;
+        drm_radeon_mem_alloc_t __user *request;
+        if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user(req32.region, &request->region)
+            || __put_user(req32.alignment, &request->alignment)
+            || __put_user(req32.size, &request->size)
+            || __put_user((int __user *)(unsigned long)req32.region_offset,
+                          &request->region_offset))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_ALLOC, (unsigned long) request);
+}
+typedef struct drm_radeon_irq_emit32 {
+        u32 irq_seq;
+} drm_radeon_irq_emit32_t;
+static int compat_radeon_irq_emit(struct file *file, unsigned int cmd,
+                                  unsigned long arg)
+{
+        drm_radeon_irq_emit32_t req32;
+        drm_radeon_irq_emit_t __user *request;
+        if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+                return -EFAULT;
+        request = compat_alloc_user_space(sizeof(*request));
+        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
+            || __put_user((int __user *)(unsigned long)req32.irq_seq,
+                          &request->irq_seq))
+                return -EFAULT;
+        return drm_ioctl(file->f_dentry->d_inode, file,
+                         DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long) request);
+}
+drm_ioctl_compat_t *radeon_compat_ioctls[] = {
+        [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
+        [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
+        [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
+        [DRM_RADEON_TEXTURE] = compat_radeon_cp_texture,
+        [DRM_RADEON_VERTEX2] = compat_radeon_cp_vertex2,
+        [DRM_RADEON_CMDBUF] = compat_radeon_cp_cmdbuf,
+        [DRM_RADEON_GETPARAM] = compat_radeon_cp_getparam,
+        [DRM_RADEON_ALLOC] = compat_radeon_mem_alloc,
+        [DRM_RADEON_IRQ_EMIT] = compat_radeon_irq_emit,
+};
+/**
+ * Called whenever a 32-bit process running under a 64-bit kernel
+ * performs an ioctl on /dev/dri/card<n>.
+ *
+ * \param filp file pointer.
+ * \param cmd command.
+ * \param arg user argument.
+ * \return zero on success or negative number on failure.
+ */
+long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
+                         unsigned long arg)
+{
+        unsigned int nr = DRM_IOCTL_NR(cmd);
+        drm_ioctl_compat_t *fn = NULL;
+        int ret;
+        if (nr < DRM_COMMAND_BASE)
+                return drm_compat_ioctl(filp, cmd, arg);
+        if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
+                fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
+        lock_kernel();          /* XXX for now */
+        if (fn != NULL)
+                ret = (*fn)(filp, cmd, arg);
+        else
+                ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
+        unlock_kernel();
+        return ret;
+}
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index cd25f28e26a3..40474a65f56d 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -35,6 +35,14 @@
 #include "radeon_drm.h"
 #include "radeon_drv.h"
+static __inline__ u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 mask)
+{
+        u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS) & mask;
+        if (irqs)
+                RADEON_WRITE(RADEON_GEN_INT_STATUS, irqs);
+        return irqs;
+}
 /* Interrupts - Used for device synchronization and flushing in the
 * following circumstances:
 *
@@ -63,8 +71,8 @@ irqreturn_t radeon_driver_irq_handler( DRM_IRQ_ARGS )
        /* Only consider the bits we're interested in - others could be used
         * outside the DRM
         */
-        stat = RADEON_READ(RADEON_GEN_INT_STATUS)
+        stat = radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK | 
-             & (RADEON_SW_INT_TEST | RADEON_CRTC_VBLANK_STAT);
+                                                  RADEON_CRTC_VBLANK_STAT));
        if (!stat)
                return IRQ_NONE;
@@ -80,19 +88,9 @@ irqreturn_t radeon_driver_irq_handler( DRM_IRQ_ARGS )
                drm_vbl_send_signals( dev );
        }
-        /* Acknowledge interrupts we handle */
-        RADEON_WRITE(RADEON_GEN_INT_STATUS, stat);
        return IRQ_HANDLED;
 }
-static __inline__ void radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv)
-{
-        u32 tmp = RADEON_READ( RADEON_GEN_INT_STATUS )
-                & (RADEON_SW_INT_TEST_ACK | RADEON_CRTC_VBLANK_STAT);
-        if (tmp)
-                RADEON_WRITE( RADEON_GEN_INT_STATUS, tmp );
-}
 static int radeon_emit_irq(drm_device_t *dev)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -141,7 +139,7 @@ int radeon_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence)
                return DRM_ERR(EINVAL);
        }
-        radeon_acknowledge_irqs( dev_priv );
+        radeon_acknowledge_irqs(dev_priv, RADEON_CRTC_VBLANK_STAT);
        dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
@@ -219,7 +217,8 @@ void radeon_driver_irq_preinstall( drm_device_t *dev ) {
        RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 );
        /* Clear bits if they're already high */
-        radeon_acknowledge_irqs( dev_priv );
+        radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK |
+                                           RADEON_CRTC_VBLANK_STAT));
 }
 void radeon_driver_irq_postinstall( drm_device_t *dev ) {
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index 7def6ad51798..62cda25724e3 100644
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -163,8 +163,7 @@ static void ds1620_out(int cmd, int bits, int value)
        netwinder_ds1620_reset();
        netwinder_unlock(&flags);
-        set_current_state(TASK_INTERRUPTIBLE);
+        msleep(20);
-        schedule_timeout(2);
 }
 static unsigned int ds1620_in(int cmd, int bits)
diff --git a/drivers/char/ftape/compressor/zftape-compress.c b/drivers/char/ftape/compressor/zftape-compress.c
index 220a227e6061..65ffc0be3df9 100644
--- a/drivers/char/ftape/compressor/zftape-compress.c
+++ b/drivers/char/ftape/compressor/zftape-compress.c
@@ -1176,8 +1176,8 @@ KERN_INFO "Compressor for zftape (lzrw3 algorithm)\n");
        }
 #else /* !MODULE */
        /* print a short no-nonsense boot message */
-        printk("zftape compressor v1.00a 970514\n");
+        printk(KERN_INFO "zftape compressor v1.00a 970514\n");
-        printk("For use with " FTAPE_VERSION "\n");
+        printk(KERN_INFO "For use with " FTAPE_VERSION "\n");
 #endif /* MODULE */
        TRACE(ft_t_info, "zft_compressor_init @ 0x%p", zft_compressor_init);
        TRACE(ft_t_info, "installing compressor for zftape ...");
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 5ec732e6ca92..762fa430fb5b 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -834,7 +834,7 @@ int hpet_alloc(struct hpet_data *hdp)
        printk("\n");
        ns = hpetp->hp_period;  /* femptoseconds, 10^-15 */
-        do_div(ns, 1000000);    /* convert to nanoseconds, 10^-9 */
+        ns /= 1000000;          /* convert to nanoseconds, 10^-9 */
        printk(KERN_INFO "hpet%d: %ldns tick, %d %d-bit timers\n",
                hpetp->hp_which, ns, hpetp->hp_ntimer,
                cap & HPET_COUNTER_SIZE_MASK ? 64 : 32);
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index a81197640283..6c4b3f986d0c 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -20,13 +20,14 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#include <linux/apm_bios.h>
+#include <linux/seq_file.h>
+#include <linux/dmi.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/i8k.h>
-#define I8K_VERSION             "1.13 14/05/2002"
+#define I8K_VERSION             "1.14 21/02/2005"
 #define I8K_SMM_FN_STATUS       0x0025
 #define I8K_SMM_POWER_STATUS    0x0069
@@ -34,7 +35,8 @@
 #define I8K_SMM_GET_FAN         0x00a3
 #define I8K_SMM_GET_SPEED       0x02a3
 #define I8K_SMM_GET_TEMP        0x10a3
-#define I8K_SMM_GET_DELL_SIG    0xffa3
+#define I8K_SMM_GET_DELL_SIG1   0xfea3
+#define I8K_SMM_GET_DELL_SIG2   0xffa3
 #define I8K_SMM_BIOS_VERSION    0x00a6
 #define I8K_FAN_MULT            30
@@ -52,18 +54,7 @@
 #define I8K_TEMPERATURE_BUG     1
-#define DELL_SIGNATURE          "Dell Computer"
+static char bios_version[4];
-static char *supported_models[] = {
-    "Inspiron",
-    "Latitude",
-    NULL
-};
-static char system_vendor[48] = "?";
-static char product_name [48] = "?";
-static char bios_version [4]  = "?";
-static char serial_number[16] = "?";
 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
@@ -73,6 +64,10 @@ static int force;
 module_param(force, bool, 0);
 MODULE_PARM_DESC(force, "Force loading without checking for supported models");
+static int ignore_dmi;
+module_param(ignore_dmi, bool, 0);
+MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match");
 static int restricted;
 module_param(restricted, bool, 0);
 MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set");
@@ -81,69 +76,69 @@ static int power_status;
 module_param(power_status, bool, 0600);
 MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k");
-static ssize_t i8k_read(struct file *, char __user *, size_t, loff_t *);
+static int i8k_open_fs(struct inode *inode, struct file *file);
 static int i8k_ioctl(struct inode *, struct file *, unsigned int,
                     unsigned long);
 static struct file_operations i8k_fops = {
-    .read       = i8k_read,
+        .open           = i8k_open_fs,
-    .ioctl      = i8k_ioctl,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .ioctl          = i8k_ioctl,
+};
+struct smm_regs {
+        unsigned int eax;
+        unsigned int ebx __attribute__ ((packed));
+        unsigned int ecx __attribute__ ((packed));
+        unsigned int edx __attribute__ ((packed));
+        unsigned int esi __attribute__ ((packed));
+        unsigned int edi __attribute__ ((packed));
 };
-typedef struct {
+static inline char *i8k_get_dmi_data(int field)
-    unsigned int eax;
+{
-    unsigned int ebx __attribute__ ((packed));
+        return dmi_get_system_info(field) ? : "N/A";
-    unsigned int ecx __attribute__ ((packed));
+}
-    unsigned int edx __attribute__ ((packed));
-    unsigned int esi __attribute__ ((packed));
-    unsigned int edi __attribute__ ((packed));
-} SMMRegisters;
-typedef struct {
-    u8  type;
-    u8  length;
-    u16 handle;
-} DMIHeader;
 /*
 * Call the System Management Mode BIOS. Code provided by Jonathan Buzzard.
 */
-static int i8k_smm(SMMRegisters *regs)
+static int i8k_smm(struct smm_regs *regs)
 {
-    int rc;
+        int rc;
-    int eax = regs->eax;
+        int eax = regs->eax;
-    asm("pushl %%eax\n\t" \
+        asm("pushl %%eax\n\t"
-        "movl 0(%%eax),%%edx\n\t" \
+            "movl 0(%%eax),%%edx\n\t"
-        "push %%edx\n\t" \
+            "push %%edx\n\t"
-        "movl 4(%%eax),%%ebx\n\t" \
+            "movl 4(%%eax),%%ebx\n\t"
-        "movl 8(%%eax),%%ecx\n\t" \
+            "movl 8(%%eax),%%ecx\n\t"
-        "movl 12(%%eax),%%edx\n\t" \
+            "movl 12(%%eax),%%edx\n\t"
-        "movl 16(%%eax),%%esi\n\t" \
+            "movl 16(%%eax),%%esi\n\t"
-        "movl 20(%%eax),%%edi\n\t" \
+            "movl 20(%%eax),%%edi\n\t"
-        "popl %%eax\n\t" \
+            "popl %%eax\n\t"
-        "out %%al,$0xb2\n\t" \
+            "out %%al,$0xb2\n\t"
-        "out %%al,$0x84\n\t" \
+            "out %%al,$0x84\n\t"
-        "xchgl %%eax,(%%esp)\n\t"
+            "xchgl %%eax,(%%esp)\n\t"
-        "movl %%ebx,4(%%eax)\n\t" \
+            "movl %%ebx,4(%%eax)\n\t"
-        "movl %%ecx,8(%%eax)\n\t" \
+            "movl %%ecx,8(%%eax)\n\t"
-        "movl %%edx,12(%%eax)\n\t" \
+            "movl %%edx,12(%%eax)\n\t"
-        "movl %%esi,16(%%eax)\n\t" \
+            "movl %%esi,16(%%eax)\n\t"
-        "movl %%edi,20(%%eax)\n\t" \
+            "movl %%edi,20(%%eax)\n\t"
-        "popl %%edx\n\t" \
+            "popl %%edx\n\t"
-        "movl %%edx,0(%%eax)\n\t" \
+            "movl %%edx,0(%%eax)\n\t"
-        "lahf\n\t" \
+            "lahf\n\t"
-        "shrl $8,%%eax\n\t" \
+            "shrl $8,%%eax\n\t"
-        "andl $1,%%eax\n" \
+            "andl $1,%%eax\n":"=a"(rc)
-        : "=a" (rc)
+            :    "a"(regs)
-        : "a" (regs)
+            :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
-        : "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
+        if (rc != 0 || (regs->eax & 0xffff) == 0xffff || regs->eax == eax)
-    if ((rc != 0) || ((regs->eax & 0xffff) == 0xffff) || (regs->eax == eax)) {
+                return -EINVAL;
-        return -EINVAL;
-    }
+        return 0;
-    return 0;
 }
 /*
@@ -152,24 +147,9 @@ static int i8k_smm(SMMRegisters *regs)
 */
 static int i8k_get_bios_version(void)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = I8K_SMM_BIOS_VERSION, };
-    int rc;
-    regs.eax = I8K_SMM_BIOS_VERSION;
-    if ((rc=i8k_smm(&regs)) < 0) {
-        return rc;
-    }
-    return regs.eax;
-}
-/*
+        return i8k_smm(&regs) ? : regs.eax;
- * Read the machine id.
- */
-static int i8k_get_serial_number(unsigned char *buff)
-{
-    strlcpy(buff, serial_number, sizeof(serial_number));
-    return 0;
 }
 /*
@@ -177,24 +157,22 @@ static int i8k_get_serial_number(unsigned char *buff)
 */
 static int i8k_get_fn_status(void)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = I8K_SMM_FN_STATUS, };
-    int rc;
+        int rc;
-    regs.eax = I8K_SMM_FN_STATUS;
+        if ((rc = i8k_smm(&regs)) < 0)
-    if ((rc=i8k_smm(&regs)) < 0) {
+                return rc;
-        return rc;
-    }
+        switch ((regs.eax >> I8K_FN_SHIFT) & I8K_FN_MASK) {
+        case I8K_FN_UP:
-    switch ((regs.eax >> I8K_FN_SHIFT) & I8K_FN_MASK) {
+                return I8K_VOL_UP;
-    case I8K_FN_UP:
+        case I8K_FN_DOWN:
-        return I8K_VOL_UP;
+                return I8K_VOL_DOWN;
-    case I8K_FN_DOWN:
+        case I8K_FN_MUTE:
-        return I8K_VOL_DOWN;
+                return I8K_VOL_MUTE;
-    case I8K_FN_MUTE:
+        default:
-        return I8K_VOL_MUTE;
+                return 0;
-    default:
+        }
-        return 0;
-    }
 }
 /*
@@ -202,20 +180,13 @@ static int i8k_get_fn_status(void)
 */
 static int i8k_get_power_status(void)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = I8K_SMM_POWER_STATUS, };
-    int rc;
+        int rc;
-    regs.eax = I8K_SMM_POWER_STATUS;
+        if ((rc = i8k_smm(&regs)) < 0)
-    if ((rc=i8k_smm(&regs)) < 0) {
+                return rc;
-        return rc;
-    }
+        return (regs.eax & 0xff) == I8K_POWER_AC ? I8K_AC : I8K_BATTERY;
-    switch (regs.eax & 0xff) {
-    case I8K_POWER_AC:
-        return I8K_AC;
-    default:
-        return I8K_BATTERY;
-    }
 }
 /*
@@ -223,16 +194,10 @@ static int i8k_get_power_status(void)
 */
 static int i8k_get_fan_status(int fan)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = I8K_SMM_GET_FAN, };
-    int rc;
-    regs.eax = I8K_SMM_GET_FAN;
-    regs.ebx = fan & 0xff;
-    if ((rc=i8k_smm(&regs)) < 0) {
-        return rc;
-    }
-    return (regs.eax & 0xff);
+        regs.ebx = fan & 0xff;
+        return i8k_smm(&regs) ? : regs.eax & 0xff;
 }
 /*
@@ -240,16 +205,10 @@ static int i8k_get_fan_status(int fan)
 */
 static int i8k_get_fan_speed(int fan)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = I8K_SMM_GET_SPEED, };
-    int rc;
-    regs.eax = I8K_SMM_GET_SPEED;
+        regs.ebx = fan & 0xff;
-    regs.ebx = fan & 0xff;
+        return i8k_smm(&regs) ? : (regs.eax & 0xffff) * I8K_FAN_MULT;
-    if ((rc=i8k_smm(&regs)) < 0) {
-        return rc;
-    }
-    return (regs.eax & 0xffff) * I8K_FAN_MULT;
 }
 /*
@@ -257,532 +216,318 @@ static int i8k_get_fan_speed(int fan)
 */
 static int i8k_set_fan(int fan, int speed)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = I8K_SMM_SET_FAN, };
-    int rc;
-    speed = (speed < 0) ? 0 : ((speed > I8K_FAN_MAX) ? I8K_FAN_MAX : speed);
-    regs.eax = I8K_SMM_SET_FAN;
+        speed = (speed < 0) ? 0 : ((speed > I8K_FAN_MAX) ? I8K_FAN_MAX : speed);
-    regs.ebx = (fan & 0xff) | (speed << 8);
+        regs.ebx = (fan & 0xff) | (speed << 8);
-    if ((rc=i8k_smm(&regs)) < 0) {
-        return rc;
-    }
-    return (i8k_get_fan_status(fan));
+        return i8k_smm(&regs) ? : i8k_get_fan_status(fan);
 }
 /*
 * Read the cpu temperature.
 */
-static int i8k_get_cpu_temp(void)
+static int i8k_get_temp(int sensor)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = I8K_SMM_GET_TEMP, };
-    int rc;
+        int rc;
-    int temp;
+        int temp;
 #ifdef I8K_TEMPERATURE_BUG
-    static int prev = 0;
+        static int prev;
 #endif
+        regs.ebx = sensor & 0xff;
+        if ((rc = i8k_smm(&regs)) < 0)
+                return rc;
-    regs.eax = I8K_SMM_GET_TEMP;
+        temp = regs.eax & 0xff;
-    if ((rc=i8k_smm(&regs)) < 0) {
-        return rc;
-    }
-    temp = regs.eax & 0xff;
 #ifdef I8K_TEMPERATURE_BUG
-    /*
+        /*
-     * Sometimes the temperature sensor returns 0x99, which is out of range.
+         * Sometimes the temperature sensor returns 0x99, which is out of range.
-     * In this case we return (once) the previous cached value. For example:
+         * In this case we return (once) the previous cached value. For example:
-     # 1003655137 00000058 00005a4b
+         # 1003655137 00000058 00005a4b
-     # 1003655138 00000099 00003a80 <--- 0x99 = 153 degrees
+         # 1003655138 00000099 00003a80 <--- 0x99 = 153 degrees
-     # 1003655139 00000054 00005c52
+         # 1003655139 00000054 00005c52
-     */
+         */
-    if (temp > I8K_MAX_TEMP) {
+        if (temp > I8K_MAX_TEMP) {
-        temp = prev;
+                temp = prev;
-        prev = I8K_MAX_TEMP;
+                prev = I8K_MAX_TEMP;
-    } else {
+        } else {
-        prev = temp;
+                prev = temp;
-    }
+        }
 #endif
-    return temp;
+        return temp;
 }
-static int i8k_get_dell_signature(void)
+static int i8k_get_dell_signature(int req_fn)
 {
-    SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+        struct smm_regs regs = { .eax = req_fn, };
-    int rc;
+        int rc;
-    regs.eax = I8K_SMM_GET_DELL_SIG;
+        if ((rc = i8k_smm(&regs)) < 0)
-    if ((rc=i8k_smm(&regs)) < 0) {
+                return rc;
-        return rc;
-    }
-    if ((regs.eax == 1145651527) && (regs.edx == 1145392204)) {
+        return regs.eax == 1145651527 && regs.edx == 1145392204 ? 0 : -1;
-        return 0;
-    } else {
-        return -1;
-    }
 }
 static int i8k_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
                     unsigned long arg)
 {
-    int val;
+        int val = 0;
-    int speed;
+        int speed;
-    unsigned char buff[16];
+        unsigned char buff[16];
-    int __user *argp = (int __user *)arg;
+        int __user *argp = (int __user *)arg;
-    if (!argp)
-        return -EINVAL;
-    switch (cmd) {
-    case I8K_BIOS_VERSION:
-        val = i8k_get_bios_version();
-        break;
-    case I8K_MACHINE_ID:
-        memset(buff, 0, 16);
-        val = i8k_get_serial_number(buff);
-        break;
-    case I8K_FN_STATUS:
-        val = i8k_get_fn_status();
-        break;
-    case I8K_POWER_STATUS:
-        val = i8k_get_power_status();
-        break;
-    case I8K_GET_TEMP:
-        val = i8k_get_cpu_temp();
-        break;
-    case I8K_GET_SPEED:
-        if (copy_from_user(&val, argp, sizeof(int))) {
-            return -EFAULT;
-        }
-        val = i8k_get_fan_speed(val);
-        break;
-    case I8K_GET_FAN:
-        if (copy_from_user(&val, argp, sizeof(int))) {
-            return -EFAULT;
-        }
-        val = i8k_get_fan_status(val);
-        break;
-    case I8K_SET_FAN:
+        if (!argp)
-        if (restricted && !capable(CAP_SYS_ADMIN)) {
+                return -EINVAL;
-            return -EPERM;
-        }
-        if (copy_from_user(&val, argp, sizeof(int))) {
-            return -EFAULT;
-        }
-        if (copy_from_user(&speed, argp+1, sizeof(int))) {
-            return -EFAULT;
-        }
-        val = i8k_set_fan(val, speed);
-        break;
-    default:
+        switch (cmd) {
-        return -EINVAL;
+        case I8K_BIOS_VERSION:
-    }
+                val = i8k_get_bios_version();
+                break;
-    if (val < 0) {
+        case I8K_MACHINE_ID:
-        return val;
+                memset(buff, 0, 16);
-    }
+                strlcpy(buff, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), sizeof(buff));
+                break;
-    switch (cmd) {
+        case I8K_FN_STATUS:
-    case I8K_BIOS_VERSION:
+                val = i8k_get_fn_status();
-        if (copy_to_user(argp, &val, 4)) {
+                break;
-            return -EFAULT;
-        }
-        break;
-    case I8K_MACHINE_ID:
-        if (copy_to_user(argp, buff, 16)) {
-            return -EFAULT;
-        }
-        break;
-    default:
-        if (copy_to_user(argp, &val, sizeof(int))) {
-            return -EFAULT;
-        }
-        break;
-    }
-    return 0;
+        case I8K_POWER_STATUS:
-}
+                val = i8k_get_power_status();
+                break;
-/*
+        case I8K_GET_TEMP:
- * Print the information for /proc/i8k.
+                val = i8k_get_temp(0);
- */
+                break;
-static int i8k_get_info(char *buffer, char **start, off_t fpos, int length)
-{
-    int n, fn_key, cpu_temp, ac_power;
-    int left_fan, right_fan, left_speed, right_speed;
-    cpu_temp     = i8k_get_cpu_temp();                  /* 11100 �s */
-    left_fan     = i8k_get_fan_status(I8K_FAN_LEFT);    /*   580 �s */
-    right_fan    = i8k_get_fan_status(I8K_FAN_RIGHT);   /*   580 �s */
-    left_speed   = i8k_get_fan_speed(I8K_FAN_LEFT);     /*   580 �s */
-    right_speed  = i8k_get_fan_speed(I8K_FAN_RIGHT);    /*   580 �s */
-    fn_key       = i8k_get_fn_status();                 /*   750 �s */
-    if (power_status) {
-        ac_power = i8k_get_power_status();              /* 14700 �s */
-    } else {
-        ac_power = -1;
-    }
-    /*
-     * Info:
-     *
-     * 1)  Format version (this will change if format changes)
-     * 2)  BIOS version
-     * 3)  BIOS machine ID
-     * 4)  Cpu temperature
-     * 5)  Left fan status
-     * 6)  Right fan status
-     * 7)  Left fan speed
-     * 8)  Right fan speed
-     * 9)  AC power
-     * 10) Fn Key status
-     */
-    n = sprintf(buffer, "%s %s %s %d %d %d %d %d %d %d\n",
-                I8K_PROC_FMT,
-                bios_version,
-                serial_number,
-                cpu_temp,
-                left_fan,
-                right_fan,
-                left_speed,
-                right_speed,
-                ac_power,
-                fn_key);
-    return n;
-}
-static ssize_t i8k_read(struct file *f, char __user *buffer, size_t len, loff_t *fpos)
+        case I8K_GET_SPEED:
-{
+                if (copy_from_user(&val, argp, sizeof(int)))
-    int n;
+                        return -EFAULT;
-    char info[128];
-    n = i8k_get_info(info, NULL, 0, 128);
+                val = i8k_get_fan_speed(val);
-    if (n <= 0) {
+                break;
-        return n;
-    }
-    if (*fpos >= n) {
+        case I8K_GET_FAN:
-        return 0;
+                if (copy_from_user(&val, argp, sizeof(int)))
-    }
+                        return -EFAULT;
-    if ((*fpos + len) >= n) {
+                val = i8k_get_fan_status(val);
-        len = n - *fpos;
+                break;
-    }
-    if (copy_to_user(buffer, info, len) != 0) {
+        case I8K_SET_FAN:
-        return -EFAULT;
+                if (restricted && !capable(CAP_SYS_ADMIN))
-    }
+                        return -EPERM;
-    *fpos += len;
+                if (copy_from_user(&val, argp, sizeof(int)))
-    return len;
+                        return -EFAULT;
-}
-static char* __init string_trim(char *s, int size)
+                if (copy_from_user(&speed, argp + 1, sizeof(int)))
-{
+                        return -EFAULT;
-    int len;
-    char *p;
-    if ((len = strlen(s)) > size) {
+                val = i8k_set_fan(val, speed);
-        len = size;
+                break;
-    }
-    for (p=s+len-1; len && (*p==' '); len--,p--) {
+        default:
-        *p = '\0';
+                return -EINVAL;
-    }
+        }
-    return s;
+        if (val < 0)
-}
+                return val;
-/* DMI code, stolen from arch/i386/kernel/dmi_scan.c */
+        switch (cmd) {
+        case I8K_BIOS_VERSION:
+                if (copy_to_user(argp, &val, 4))
+                        return -EFAULT;
-/*
+                break;
- * |<-- dmi->length -->|
+        case I8K_MACHINE_ID:
- * |                   |
+                if (copy_to_user(argp, buff, 16))
- * |dmi header    s=N  | string1,\0, ..., stringN,\0, ..., \0
+                        return -EFAULT;
- *                |                       |
- *                +-----------------------+
- */
-static char* __init dmi_string(DMIHeader *dmi, u8 s)
-{
-    u8 *p;
-    if (!s) {
+                break;
-        return "";
+        default:
-    }
+                if (copy_to_user(argp, &val, sizeof(int)))
-    s--;
+                        return -EFAULT;
-    p = (u8 *)dmi + dmi->length;
+                break;
-    while (s > 0) {
+        }
-        p += strlen(p);
-        p++;
-        s--;
-    }
-    return p;
+        return 0;
 }
-static void __init dmi_decode(DMIHeader *dmi)
+/*
+ * Print the information for /proc/i8k.
+ */
+static int i8k_proc_show(struct seq_file *seq, void *offset)
 {
-    u8 *data = (u8 *) dmi;
+        int fn_key, cpu_temp, ac_power;
-    char *p;
+        int left_fan, right_fan, left_speed, right_speed;
-#ifdef I8K_DEBUG
+        cpu_temp        = i8k_get_temp(0);                      /* 11100 �s */
-    int i;
+        left_fan        = i8k_get_fan_status(I8K_FAN_LEFT);     /*   580 �s */
-    printk("%08x ", (int)data);
+        right_fan       = i8k_get_fan_status(I8K_FAN_RIGHT);    /*   580 �s */
-    for (i=0; i<data[1] && i<64; i++) {
+        left_speed      = i8k_get_fan_speed(I8K_FAN_LEFT);      /*   580 �s */
-        printk("%02x ", data[i]);
+        right_speed     = i8k_get_fan_speed(I8K_FAN_RIGHT);     /*   580 �s */
-    }
+        fn_key          = i8k_get_fn_status();                  /*   750 �s */
-    printk("\n");
+        if (power_status)
-#endif
+                ac_power = i8k_get_power_status();              /* 14700 �s */
+        else
-    switch (dmi->type) {
+                ac_power = -1;
-    case  0:    /* BIOS Information */
-        p = dmi_string(dmi,data[5]);
-        if (*p) {
-            strlcpy(bios_version, p, sizeof(bios_version));
-            string_trim(bios_version, sizeof(bios_version));
-        }
-        break;  
-    case 1:     /* System Information */
-        p = dmi_string(dmi,data[4]);
-        if (*p) {
-            strlcpy(system_vendor, p, sizeof(system_vendor));
-            string_trim(system_vendor, sizeof(system_vendor));
-        }
-        p = dmi_string(dmi,data[5]);
-        if (*p) {
-            strlcpy(product_name, p, sizeof(product_name));
-            string_trim(product_name, sizeof(product_name));
-        }
-        p = dmi_string(dmi,data[7]);
-        if (*p) {
-            strlcpy(serial_number, p, sizeof(serial_number));
-            string_trim(serial_number, sizeof(serial_number));
-        }
-        break;
-    }
-}
-static int __init dmi_table(u32 base, int len, int num, void (*fn)(DMIHeader*))
-{
-    u8 *buf;
-    u8 *data;
-    DMIHeader *dmi;
-    int i = 1;
-    buf = ioremap(base, len);
-    if (buf == NULL) {
-        return -1;
-    }
-    data = buf;
-    /*
-     * Stop when we see al the items the table claimed to have
-     * or we run off the end of the table (also happens)
-     */
-    while ((i<num) && ((data-buf) < len)) {
-        dmi = (DMIHeader *)data;
-        /*
-         * Avoid misparsing crud if the length of the last
-         * record is crap
-         */
-        if ((data-buf+dmi->length) >= len) {
-            break;
-        }
-        fn(dmi);
-        data += dmi->length;
        /*
-         * Don't go off the end of the data if there is
+         * Info:
-         * stuff looking like string fill past the end
+         *
+         * 1)  Format version (this will change if format changes)
+         * 2)  BIOS version
+         * 3)  BIOS machine ID
+         * 4)  Cpu temperature
+         * 5)  Left fan status
+         * 6)  Right fan status
+         * 7)  Left fan speed
+         * 8)  Right fan speed
+         * 9)  AC power
+         * 10) Fn Key status
         */
-        while (((data-buf) < len) && (*data || data[1])) {
+        return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
-            data++;
+                          I8K_PROC_FMT,
-        }
+                          bios_version,
-        data += 2;
+                          dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A",
-        i++;
+                          cpu_temp,
-    }
+                          left_fan, right_fan, left_speed, right_speed,
-    iounmap(buf);
+                          ac_power, fn_key);
-    return 0;
 }
-static int __init dmi_iterate(void (*decode)(DMIHeader *))
+static int i8k_open_fs(struct inode *inode, struct file *file)
 {
-        unsigned char buf[20];
+        return single_open(file, i8k_proc_show, NULL);
-        void __iomem *p = ioremap(0xe0000, 0x20000), *q;
-        if (!p)
-                return -1;
-        for (q = p; q < p + 0x20000; q += 16) {
-                memcpy_fromio(buf, q, 20);
-                if (memcmp(buf, "_DMI_", 5)==0) {
-                        u16 num  = buf[13]<<8  | buf[12];
-                        u16 len  = buf [7]<<8  | buf [6];
-                        u32 base = buf[11]<<24 | buf[10]<<16 | buf[9]<<8 | buf[8];
-#ifdef I8K_DEBUG
-                        printk(KERN_INFO "DMI %d.%d present.\n",
-                           buf[14]>>4, buf[14]&0x0F);
-                        printk(KERN_INFO "%d structures occupying %d bytes.\n",
-                           buf[13]<<8 | buf[12],
-                           buf [7]<<8 | buf[6]);
-                        printk(KERN_INFO "DMI table at 0x%08X.\n",
-                           buf[11]<<24 | buf[10]<<16 | buf[9]<<8 | buf[8]);
-#endif
-                        if (dmi_table(base, len, num, decode)==0) {
-                                iounmap(p);
-                                return 0;
-                        }
-                }
-        }
-        iounmap(p);
-        return -1;
 }
-/* end of DMI code */
-/*
- * Get DMI information.
- */
-static int __init i8k_dmi_probe(void)
-{
-    char **p;
-    if (dmi_iterate(dmi_decode) != 0) {
-        printk(KERN_INFO "i8k: unable to get DMI information\n");
-        return -ENODEV;
-    }
-    if (strncmp(system_vendor,DELL_SIGNATURE,strlen(DELL_SIGNATURE)) != 0) {
-        printk(KERN_INFO "i8k: not running on a Dell system\n");
-        return -ENODEV;
-    }
-    for (p=supported_models; ; p++) {
-        if (!*p) {
-            printk(KERN_INFO "i8k: unsupported model: %s\n", product_name);
-            return -ENODEV;
-        }
-        if (strncmp(product_name,*p,strlen(*p)) == 0) {
-            break;
-        }
-    }
-    return 0;
+static struct dmi_system_id __initdata i8k_dmi_table[] = {
-}
+        {
+                .ident = "Dell Inspiron",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron"),
+                },
+        },
+        {
+                .ident = "Dell Latitude",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+                },
+        },
+        {
+                .ident = "Dell Inspiron 2",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron"),
+                },
+        },
+        {
+                .ident = "Dell Latitude 2",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+                },
+        },
+        { }
+};
 /*
 * Probe for the presence of a supported laptop.
 */
 static int __init i8k_probe(void)
 {
-    char buff[4];
+        char buff[4];
-    int version;
+        int version;
-    int smm_found = 0;
-    /*
-     * Get DMI information
-     */
-    if (i8k_dmi_probe() != 0) {
-        printk(KERN_INFO "i8k: vendor=%s, model=%s, version=%s\n",
-               system_vendor, product_name, bios_version);
-    }
-    /*
-     * Get SMM Dell signature
-     */
-    if (i8k_get_dell_signature() != 0) {
-        printk(KERN_INFO "i8k: unable to get SMM Dell signature\n");
-    } else {
-        smm_found = 1;
-    }
-    /*
-     * Get SMM BIOS version.
-     */
-    version = i8k_get_bios_version();
-    if (version <= 0) {
-        printk(KERN_INFO "i8k: unable to get SMM BIOS version\n");
-    } else {
-        smm_found = 1;
-        buff[0] = (version >> 16) & 0xff;
-        buff[1] = (version >>  8) & 0xff;
-        buff[2] = (version)       & 0xff;
-        buff[3] = '\0';
        /*
-         * If DMI BIOS version is unknown use SMM BIOS version.
+         * Get DMI information
         */
-        if (bios_version[0] == '?') {
+        if (!dmi_check_system(i8k_dmi_table)) {
-            strcpy(bios_version, buff);
+                if (!ignore_dmi && !force)
+                        return -ENODEV;
+                printk(KERN_INFO "i8k: not running on a supported Dell system.\n");
+                printk(KERN_INFO "i8k: vendor=%s, model=%s, version=%s\n",
+                        i8k_get_dmi_data(DMI_SYS_VENDOR),
+                        i8k_get_dmi_data(DMI_PRODUCT_NAME),
+                        i8k_get_dmi_data(DMI_BIOS_VERSION));
        }
+        strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), sizeof(bios_version));
        /*
-         * Check if the two versions match.
+         * Get SMM Dell signature
         */
-        if (strncmp(buff,bios_version,sizeof(bios_version)) != 0) {
+        if (i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG1) &&
-            printk(KERN_INFO "i8k: BIOS version mismatch: %s != %s\n",
+            i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG2)) {
-                   buff, bios_version);
+                printk(KERN_ERR "i8k: unable to get SMM Dell signature\n");
+                if (!force)
+                        return -ENODEV;
        }
-    }
-    if (!smm_found && !force) {
+        /*
-        return -ENODEV;
+         * Get SMM BIOS version.
-    }
+         */
+        version = i8k_get_bios_version();
+        if (version <= 0) {
+                printk(KERN_WARNING "i8k: unable to get SMM BIOS version\n");
+        } else {
+                buff[0] = (version >> 16) & 0xff;
+                buff[1] = (version >> 8) & 0xff;
+                buff[2] = (version) & 0xff;
+                buff[3] = '\0';
+                /*
+                 * If DMI BIOS version is unknown use SMM BIOS version.
+                 */
+                if (!dmi_get_system_info(DMI_BIOS_VERSION))
+                        strlcpy(bios_version, buff, sizeof(bios_version));
+                /*
+                 * Check if the two versions match.
+                 */
+                if (strncmp(buff, bios_version, sizeof(bios_version)) != 0)
+                        printk(KERN_WARNING "i8k: BIOS version mismatch: %s != %s\n",
+                                buff, bios_version);
+        }
-    return 0;
+        return 0;
 }
-#ifdef MODULE
+static int __init i8k_init(void)
-static
-#endif
-int __init i8k_init(void)
 {
-    struct proc_dir_entry *proc_i8k;
+        struct proc_dir_entry *proc_i8k;
-    /* Are we running on an supported laptop? */
-    if (i8k_probe() != 0) {
-        return -ENODEV;
-    }
-    /* Register the proc entry */
-    proc_i8k = create_proc_info_entry("i8k", 0, NULL, i8k_get_info);
-    if (!proc_i8k) {
-        return -ENOENT;
-    }
-    proc_i8k->proc_fops = &i8k_fops;
-    proc_i8k->owner = THIS_MODULE;
-    printk(KERN_INFO
-           "Dell laptop SMM driver v%s Massimo Dal Zotto (dz@debian.org)\n",
-           I8K_VERSION);
-    return 0;
-}
-#ifdef MODULE
+        /* Are we running on an supported laptop? */
-int init_module(void)
+        if (i8k_probe())
-{
+                return -ENODEV;
-    return i8k_init();
+        /* Register the proc entry */
+        proc_i8k = create_proc_entry("i8k", 0, NULL);
+        if (!proc_i8k)
+                return -ENOENT;
+        proc_i8k->proc_fops = &i8k_fops;
+        proc_i8k->owner = THIS_MODULE;
+        printk(KERN_INFO
+               "Dell laptop SMM driver v%s Massimo Dal Zotto (dz@debian.org)\n",
+               I8K_VERSION);
+        return 0;
 }
-void cleanup_module(void)
+static void __exit i8k_exit(void)
 {
-    /* Remove the proc entry */
+        remove_proc_entry("i8k", NULL);
-    remove_proc_entry("i8k", NULL);
-    printk(KERN_INFO "i8k: module unloaded\n");
 }
-#endif
-/* end of file */
+module_init(i8k_init);
+module_exit(i8k_exit);
diff --git a/drivers/char/ip2/i2cmd.c b/drivers/char/ip2/i2cmd.c
index fd299d6c42ac..cb8f4198e9a3 100644
--- a/drivers/char/ip2/i2cmd.c
+++ b/drivers/char/ip2/i2cmd.c
@@ -97,7 +97,7 @@ static UCHAR ct41[] = { 1, BYP,     0x29                     }; // RESUME
 //static UCHAR ct44[]={ 2, BTH,     0x2C,0                   }; // MS PING
 //static UCHAR ct45[]={ 1, BTH,     0x2D                     }; // HOTENAB
 //static UCHAR ct46[]={ 1, BTH,     0x2E                     }; // HOTDSAB
-static UCHAR ct47[] = { 7, BTH,     0x2F,0,0,0,0,0,0         }; // UNIX FLAGS
+//static UCHAR ct47[]={ 7, BTH,     0x2F,0,0,0,0,0,0         }; // UNIX FLAGS
 //static UCHAR ct48[]={ 1, BTH,     0x30                     }; // DSRFLOWENAB
 //static UCHAR ct49[]={ 1, BTH,     0x31                     }; // DSRFLOWDSAB
 //static UCHAR ct50[]={ 1, BTH,     0x32                     }; // DTRFLOWENAB
@@ -162,6 +162,7 @@ static UCHAR ct89[]={ 1, BYP,     0x59                     }; // DSS_NOW
 // This routine sets the parameters of command 47 and returns a pointer to the
 // appropriate structure.
 //******************************************************************************
+#if 0
 cmdSyntaxPtr
 i2cmdUnixFlags(unsigned short iflag,unsigned short cflag,unsigned short lflag)
 {
@@ -175,6 +176,7 @@ i2cmdUnixFlags(unsigned short iflag,unsigned short cflag,unsigned short lflag)
        pCM->cmd[6] = (unsigned char) (lflag >> 8);
        return pCM;
 }
+#endif  /*  0  */
 //******************************************************************************
 // Function:   i2cmdBaudDef(which, rate)
@@ -187,7 +189,7 @@ i2cmdUnixFlags(unsigned short iflag,unsigned short cflag,unsigned short lflag)
 // This routine sets the parameters of commands 54 or 55 (according to the
 // argument which), and returns a pointer to the appropriate structure.
 //******************************************************************************
-cmdSyntaxPtr
+static cmdSyntaxPtr
 i2cmdBaudDef(int which, unsigned short rate)
 {
        cmdSyntaxPtr pCM;
diff --git a/drivers/char/ip2/i2cmd.h b/drivers/char/ip2/i2cmd.h
index c41728a85710..baa4e721b758 100644
--- a/drivers/char/ip2/i2cmd.h
+++ b/drivers/char/ip2/i2cmd.h
@@ -64,16 +64,6 @@ typedef struct _cmdSyntax
                                                // directly from user-level
 #define VAR 0x10        // This command is of variable length!
-//-----------------------------------
-// External declarations for i2cmd.c
-//-----------------------------------
-// Routine to set up parameters for the "define hot-key sequence" command. Since
-// there is more than one parameter to assign, we must use a function rather
-// than a macro (used usually).
-//
-extern cmdSyntaxPtr i2cmdUnixFlags(USHORT iflag,USHORT cflag,USHORT lflag);
-extern cmdSyntaxPtr i2cmdBaudDef(int which, USHORT rate);
 // Declarations for the global arrays used to bear the commands and their
 // arguments.
 //
@@ -433,6 +423,7 @@ static UCHAR cc02[];
 #define CMD_HOT_ENAB (cmdSyntaxPtr)(ct45) // Enable Hot-key checking
 #define CMD_HOT_DSAB (cmdSyntaxPtr)(ct46) // Disable Hot-key checking
+#if 0
 // COMMAND 47: Send Protocol info via Unix flags:
 // iflag = Unix tty t_iflag
 // cflag = Unix tty t_cflag
@@ -441,6 +432,7 @@ static UCHAR cc02[];
 // within these flags
 //
 #define CMD_UNIX_FLAGS(iflag,cflag,lflag) i2cmdUnixFlags(iflag,cflag,lflag)
+#endif  /*  0  */
 #define CMD_DSRFL_ENAB  (cmdSyntaxPtr)(ct48) // Enable  DSR receiver ctrl
 #define CMD_DSRFL_DSAB  (cmdSyntaxPtr)(ct49) // Disable DSR receiver ctrl
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index 3b8314b4249a..cf0cd58d6305 100644
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -2691,16 +2691,6 @@ no_xon:
                pCh->flags      |= ASYNC_CHECK_CD;
        }
-#ifdef XXX
-do_flags_thing: // This is a test, we don't do the flags thing
-        
-        if ( (cflag & CRTSCTS) ) {
-                cflag |= 014000000000;
-        }
-        i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, 
-                                CMD_UNIX_FLAGS(iflag,cflag,lflag));
-#endif
-                
 service_it:
        i2DrainOutput( pCh, 100 );              
 }
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 601c7fccb4cf..1bbf507adda5 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1756,7 +1756,7 @@ static void isicom_flush_buffer(struct tty_struct * tty)
 }
-static int __init register_ioregion(void)
+static int __devinit register_ioregion(void)
 {
        int count, done=0;
        for (count=0; count < BOARD_COUNT; count++ ) {
@@ -1771,7 +1771,7 @@ static int __init register_ioregion(void)
        return done;
 }
-static void __exit unregister_ioregion(void)
+static void unregister_ioregion(void)
 {
        int count;
        for (count=0; count < BOARD_COUNT; count++ ) 
@@ -1803,7 +1803,7 @@ static struct tty_operations isicom_ops = {
        .tiocmset       = isicom_tiocmset,
 };
-static int __init register_drivers(void)
+static int __devinit register_drivers(void)
 {
        int error;
@@ -1834,7 +1834,7 @@ static int __init register_drivers(void)
        return 0;
 }
-static void __exit unregister_drivers(void)
+static void unregister_drivers(void)
 {
        int error = tty_unregister_driver(isicom_normal);
        if (error)
@@ -1842,7 +1842,7 @@ static void __exit unregister_drivers(void)
        put_tty_driver(isicom_normal);
 }
-static int __init register_isr(void)
+static int __devinit register_isr(void)
 {
        int count, done=0;
        unsigned long irqflags;
@@ -1883,7 +1883,7 @@ static void __exit unregister_isr(void)
        }
 }
-static int __init isicom_init(void)
+static int __devinit isicom_init(void)
 {
        int card, channel, base;
        struct isi_port * port;
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index c02a21dbad5d..52a073eee201 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -407,7 +407,6 @@ static unsigned long	stli_eisamemprobeaddrs[] = {
 };
 static int      stli_eisamempsize = sizeof(stli_eisamemprobeaddrs) / sizeof(unsigned long);
-int             stli_eisaprobe = STLI_EISAPROBE;
 /*
 *      Define the Stallion PCI vendor and device IDs.
@@ -4685,7 +4684,7 @@ static int stli_initbrds(void)
 #ifdef MODULE
        stli_argbrds();
 #endif
-        if (stli_eisaprobe)
+        if (STLI_EISAPROBE)
                stli_findeisabrds();
 #ifdef CONFIG_PCI
        stli_findpcibrds();
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index e3085b22a365..42187381506b 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -23,7 +23,10 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/ptrace.h>
 #include <linux/device.h>
+#include <linux/highmem.h>
+#include <linux/crash_dump.h>
 #include <linux/backing-dev.h>
+#include <linux/bootmem.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -273,6 +276,40 @@ static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
        return mmap_mem(file, vma);
 }
+#ifdef CONFIG_CRASH_DUMP
+/*
+ * Read memory corresponding to the old kernel.
+ */
+static ssize_t read_oldmem(struct file *file, char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        unsigned long pfn, offset;
+        size_t read = 0, csize;
+        int rc = 0;
+        while (count) {
+                pfn = *ppos / PAGE_SIZE;
+                if (pfn > saved_max_pfn)
+                        return read;
+                offset = (unsigned long)(*ppos % PAGE_SIZE);
+                if (count > PAGE_SIZE - offset)
+                        csize = PAGE_SIZE - offset;
+                else
+                        csize = count;
+                rc = copy_oldmem_page(pfn, buf, csize, offset, 1);
+                if (rc < 0)
+                        return rc;
+                buf += csize;
+                *ppos += csize;
+                read += csize;
+                count -= csize;
+        }
+        return read;
+}
+#endif
 extern long vread(char *buf, char *addr, unsigned long count);
 extern long vwrite(char *buf, char *addr, unsigned long count);
@@ -721,6 +758,7 @@ static int open_port(struct inode * inode, struct file * filp)
 #define read_full       read_zero
 #define open_mem        open_port
 #define open_kmem       open_mem
+#define open_oldmem     open_mem
 static struct file_operations mem_fops = {
        .llseek         = memory_lseek,
@@ -770,6 +808,13 @@ static struct file_operations full_fops = {
        .write          = write_full,
 };
+#ifdef CONFIG_CRASH_DUMP
+static struct file_operations oldmem_fops = {
+        .read   = read_oldmem,
+        .open   = open_oldmem,
+};
+#endif
 static ssize_t kmsg_write(struct file * file, const char __user * buf,
                          size_t count, loff_t *ppos)
 {
@@ -825,6 +870,11 @@ static int memory_open(struct inode * inode, struct file * filp)
                case 11:
                        filp->f_op = &kmsg_fops;
                        break;
+#ifdef CONFIG_CRASH_DUMP
+                case 12:
+                        filp->f_op = &oldmem_fops;
+                        break;
+#endif
                default:
                        return -ENXIO;
        }
@@ -854,6 +904,9 @@ static const struct {
        {8, "random",  S_IRUGO | S_IWUSR,           &random_fops},
        {9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops},
        {11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops},
+#ifdef CONFIG_CRASH_DUMP
+        {12,"oldmem",    S_IRUSR | S_IWUSR | S_IRGRP, &oldmem_fops},
+#endif
 };
 static struct class *mem_class;
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 3115d318b997..31cf84d69026 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -66,8 +66,6 @@ static unsigned char misc_minors[DYNAMIC_MINORS / 8];
 extern int rtc_DP8570A_init(void);
 extern int rtc_MK48T08_init(void);
 extern int pmu_device_init(void);
-extern int tosh_init(void);
-extern int i8k_init(void);
 #ifdef CONFIG_PROC_FS
 static void *misc_seq_start(struct seq_file *seq, loff_t *pos)
@@ -314,12 +312,6 @@ static int __init misc_init(void)
 #ifdef CONFIG_PMAC_PBOOK
        pmu_device_init();
 #endif
-#ifdef CONFIG_TOSHIBA
-        tosh_init();
-#endif
-#ifdef CONFIG_I8K
-        i8k_init();
-#endif
        if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
                printk("unable to get major %d for misc devices\n",
                       MISC_MAJOR);
diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c
index ab00f51475df..613aed9e1840 100644
--- a/drivers/char/mwave/3780i.c
+++ b/drivers/char/mwave/3780i.c
@@ -107,8 +107,8 @@ void dsp3780I_WriteMsaCfg(unsigned short usDspBaseIO,
        spin_unlock_irqrestore(&dsp_lock, flags);
 }
-void dsp3780I_WriteGenCfg(unsigned short usDspBaseIO, unsigned uIndex,
+static void dsp3780I_WriteGenCfg(unsigned short usDspBaseIO, unsigned uIndex,
-                          unsigned char ucValue)
+                                 unsigned char ucValue)
 {
        DSP_ISA_SLAVE_CONTROL rSlaveControl;
        DSP_ISA_SLAVE_CONTROL rSlaveControl_Save;
@@ -141,6 +141,7 @@ void dsp3780I_WriteGenCfg(unsigned short usDspBaseIO, unsigned uIndex,
 }
+#if 0
 unsigned char dsp3780I_ReadGenCfg(unsigned short usDspBaseIO,
                                  unsigned uIndex)
 {
@@ -167,6 +168,7 @@ unsigned char dsp3780I_ReadGenCfg(unsigned short usDspBaseIO,
        return ucValue;
 }
+#endif  /*  0  */
 int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
                       unsigned short *pIrqMap,
diff --git a/drivers/char/mwave/3780i.h b/drivers/char/mwave/3780i.h
index 3e7d020d1bf4..270431ca7dae 100644
--- a/drivers/char/mwave/3780i.h
+++ b/drivers/char/mwave/3780i.h
@@ -338,10 +338,6 @@ unsigned short dsp3780I_ReadMsaCfg(unsigned short usDspBaseIO,
                                   unsigned long ulMsaAddr);
 void dsp3780I_WriteMsaCfg(unsigned short usDspBaseIO,
                          unsigned long ulMsaAddr, unsigned short usValue);
-void dsp3780I_WriteGenCfg(unsigned short usDspBaseIO, unsigned uIndex,
-                          unsigned char ucValue);
-unsigned char dsp3780I_ReadGenCfg(unsigned short usDspBaseIO,
-                                  unsigned uIndex);
 int dsp3780I_GetIPCSource(unsigned short usDspBaseIO,
                          unsigned short *pusIPCSource);
diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c
index ab650cd6efc0..d6c72e0934e2 100644
--- a/drivers/char/mwave/tp3780i.c
+++ b/drivers/char/mwave/tp3780i.c
@@ -242,20 +242,14 @@ int tp3780I_ClaimResources(THINKPAD_BD_DATA * pBDData)
 {
        int retval = 0;
        DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
        struct resource *pres;
-#endif
        PRINTK_2(TRACE_TP3780I,
                "tp3780i::tp3780I_ClaimResources entry pBDData %p\n", pBDData);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
        pres = request_region(pSettings->usDspBaseIO, 16, "mwave_3780i");
        if ( pres == NULL ) retval = -EIO;
-#else
-        retval = check_region(pSettings->usDspBaseIO, 16);
-        if (!retval) request_region(pSettings->usDspBaseIO, 16, "mwave_3780i");
-#endif
        if (retval) {
                PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_ClaimResources: Error: Could not claim I/O region starting at %x\n", pSettings->usDspBaseIO);
                retval = -EIO;
@@ -292,7 +286,7 @@ int tp3780I_ReleaseResources(THINKPAD_BD_DATA * pBDData)
 int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
 {
        DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings;
-        BOOLEAN bDSPPoweredUp = FALSE, bDSPEnabled = FALSE, bInterruptAllocated = FALSE;
+        BOOLEAN bDSPPoweredUp = FALSE, bInterruptAllocated = FALSE;
        PRINTK_2(TRACE_TP3780I, "tp3780i::tp3780I_EnableDSP entry pBDData %p\n", pBDData);
@@ -397,8 +391,6 @@ int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
        if (dsp3780I_EnableDSP(pSettings, s_ausThinkpadIrqToField, s_ausThinkpadDmaToField)) {
                PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Error: dsp7880I_EnableDSP() failed\n");
                goto exit_cleanup;
-        } else {
-                bDSPEnabled = TRUE;
        }
        EnableSRAM(pBDData);
@@ -411,8 +403,6 @@ int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData)
 exit_cleanup:
        PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Cleaning up\n");
-        if (bDSPEnabled)
-                dsp3780I_DisableDSP(pSettings);
        if (bDSPPoweredUp)
                smapi_set_DSP_power_state(FALSE);
        if (bInterruptAllocated) {
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index f63a3fd7ca6f..1af733d07321 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -211,12 +211,13 @@ nvram_check_checksum(void)
        return rv;
 }
-void
+static void
 __nvram_set_checksum(void)
 {
        mach_set_checksum();
 }
+#if 0
 void
 nvram_set_checksum(void)
 {
@@ -226,6 +227,7 @@ nvram_set_checksum(void)
        __nvram_set_checksum();
        spin_unlock_irqrestore(&rtc_lock, flags);
 }
+#endif  /*  0  */
 /*
 * The are the file operation function for user access to /dev/nvram
@@ -921,6 +923,4 @@ EXPORT_SYMBOL(__nvram_write_byte);
 EXPORT_SYMBOL(nvram_write_byte);
 EXPORT_SYMBOL(__nvram_check_checksum);
 EXPORT_SYMBOL(nvram_check_checksum);
-EXPORT_SYMBOL(__nvram_set_checksum);
-EXPORT_SYMBOL(nvram_set_checksum);
 MODULE_ALIAS_MISCDEV(NVRAM_MINOR);
diff --git a/drivers/char/rio/func.h b/drivers/char/rio/func.h
index e8f3860f4726..01987c6dc398 100644
--- a/drivers/char/rio/func.h
+++ b/drivers/char/rio/func.h
@@ -147,7 +147,6 @@ struct rio_info * rio_info_store( int cmd, struct rio_info * p);
 extern int    rio_pcicopy(char *src, char *dst, int n);
 extern int rio_minor (struct tty_struct *tty);
 extern int rio_ismodem (struct tty_struct *tty);
-extern void rio_udelay (int usecs);
 extern void rio_start_card_running (struct Host * HostP);
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index 763893e289b3..7db3370f4972 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -354,11 +354,6 @@ int rio_ismodem(struct tty_struct *tty)
 }
-void rio_udelay (int usecs)
-{
-  udelay (usecs);
-}
 static int rio_set_real_termios (void *ptr)
 {
  int rv, modem;
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c
index dca941ed10cf..898a126ae3e6 100644
--- a/drivers/char/rio/rioinit.c
+++ b/drivers/char/rio/rioinit.c
@@ -37,6 +37,7 @@ static char *_rioinit_c_sccs_ = "@(#)rioinit.c	1.3";
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
@@ -1560,14 +1561,14 @@ uint Slot;
                                          INTERRUPT_DISABLE | BYTE_OPERATION |
                                          SLOW_LINKS | SLOW_AT_BUS);
                        WBYTE(DpRamP->DpResetTpu, 0xFF);
-                        rio_udelay (3);
+                        udelay(3);
                        rio_dprintk (RIO_DEBUG_INIT,  "RIOHostReset: Don't know if it worked. Try reset again\n");
                        WBYTE(DpRamP->DpControl,  BOOT_FROM_RAM | EXTERNAL_BUS_OFF |
                                          INTERRUPT_DISABLE | BYTE_OPERATION |
                                          SLOW_LINKS | SLOW_AT_BUS);
                        WBYTE(DpRamP->DpResetTpu, 0xFF);
-                        rio_udelay (3);
+                        udelay(3);
                        break;
 #ifdef FUTURE_RELEASE
        case RIO_EISA:
@@ -1599,7 +1600,7 @@ uint Slot;
                DpRamP->DpControl  = RIO_PCI_BOOT_FROM_RAM;
                DpRamP->DpResetInt = 0xFF;
                DpRamP->DpResetTpu = 0xFF;
-                rio_udelay (100);
+                udelay(100);
                /* for (i=0; i<6000; i++);  */
                /* suspend( 3 ); */
                break;
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
index db655002671f..78a321afdf4f 100644
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -524,16 +524,16 @@ riotclose(void  *ptr)
        register uint SysPort = dev;
        struct ttystatics *tp;          /* pointer to our ttystruct */
 #endif
-        struct Port *PortP =ptr;        /* pointer to the port structure */
+        struct Port *PortP = ptr;       /* pointer to the port structure */
        int deleted = 0;
        int     try = -1; /* Disable the timeouts by setting them to -1 */
        int     repeat_this = -1; /* Congrats to those having 15 years of 
                                     uptime! (You get to break the driver.) */
-        long end_time;
+        unsigned long end_time;
        struct tty_struct * tty;
        unsigned long flags;
        int Modem;
-        int rv =0;
+        int rv = 0;
        
        rio_dprintk (RIO_DEBUG_TTY, "port close SysPort %d\n",PortP->PortNum);
@@ -620,7 +620,7 @@ riotclose(void  *ptr)
                if (repeat_this -- <= 0) {
                        rv = -EINTR;
                        rio_dprintk (RIO_DEBUG_TTY, "Waiting for not idle closed broken by signal\n");
-                        RIOPreemptiveCmd(p, PortP, FCLOSE ); 
+                        RIOPreemptiveCmd(p, PortP, FCLOSE);
                        goto close_end;
                }
                rio_dprintk (RIO_DEBUG_TTY, "Calling timeout to flush in closing\n");
@@ -656,14 +656,12 @@ riotclose(void  *ptr)
                goto close_end;
        }
-        
        /* Can't call RIOShortCommand with the port locked. */
        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
        if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) {
-          RIOPreemptiveCmd(p, PortP,FCLOSE);
+                RIOPreemptiveCmd(p, PortP, FCLOSE);
-          goto close_end;
+                goto close_end;
        }
        if (!deleted)
@@ -698,7 +696,6 @@ riotclose(void  *ptr)
 */
        PortP->Config &= ~(RIO_CTSFLOW|RIO_RTSFLOW);
 #ifdef STATS
        PortP->Stat.CloseCnt++;
 #endif
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 5bcbeb0cb9ae..f463d6baa685 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -161,6 +161,64 @@ static Word_t upci_aiop_intr_bits[AIOP_CTL_SIZE] = {
        UPCI_AIOP_INTR_BIT_3
 };
+static Byte_t RData[RDATASIZE] = {
+        0x00, 0x09, 0xf6, 0x82,
+        0x02, 0x09, 0x86, 0xfb,
+        0x04, 0x09, 0x00, 0x0a,
+        0x06, 0x09, 0x01, 0x0a,
+        0x08, 0x09, 0x8a, 0x13,
+        0x0a, 0x09, 0xc5, 0x11,
+        0x0c, 0x09, 0x86, 0x85,
+        0x0e, 0x09, 0x20, 0x0a,
+        0x10, 0x09, 0x21, 0x0a,
+        0x12, 0x09, 0x41, 0xff,
+        0x14, 0x09, 0x82, 0x00,
+        0x16, 0x09, 0x82, 0x7b,
+        0x18, 0x09, 0x8a, 0x7d,
+        0x1a, 0x09, 0x88, 0x81,
+        0x1c, 0x09, 0x86, 0x7a,
+        0x1e, 0x09, 0x84, 0x81,
+        0x20, 0x09, 0x82, 0x7c,
+        0x22, 0x09, 0x0a, 0x0a
+};
+static Byte_t RRegData[RREGDATASIZE] = {
+        0x00, 0x09, 0xf6, 0x82, /* 00: Stop Rx processor */
+        0x08, 0x09, 0x8a, 0x13, /* 04: Tx software flow control */
+        0x0a, 0x09, 0xc5, 0x11, /* 08: XON char */
+        0x0c, 0x09, 0x86, 0x85, /* 0c: XANY */
+        0x12, 0x09, 0x41, 0xff, /* 10: Rx mask char */
+        0x14, 0x09, 0x82, 0x00, /* 14: Compare/Ignore #0 */
+        0x16, 0x09, 0x82, 0x7b, /* 18: Compare #1 */
+        0x18, 0x09, 0x8a, 0x7d, /* 1c: Compare #2 */
+        0x1a, 0x09, 0x88, 0x81, /* 20: Interrupt #1 */
+        0x1c, 0x09, 0x86, 0x7a, /* 24: Ignore/Replace #1 */
+        0x1e, 0x09, 0x84, 0x81, /* 28: Interrupt #2 */
+        0x20, 0x09, 0x82, 0x7c, /* 2c: Ignore/Replace #2 */
+        0x22, 0x09, 0x0a, 0x0a  /* 30: Rx FIFO Enable */
+};
+static CONTROLLER_T sController[CTL_SIZE] = {
+        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
+         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
+        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
+         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
+        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
+         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
+        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
+         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}}
+};
+static Byte_t sBitMapClrTbl[8] = {
+        0xfe, 0xfd, 0xfb, 0xf7, 0xef, 0xdf, 0xbf, 0x7f
+};
+static Byte_t sBitMapSetTbl[8] = {
+        0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
+};
+static int sClockPrescale = 0x14;
 /*
 *  Line number is the ttySIx number (x), the Minor number.  We 
 *  assign them sequentially, starting at zero.  The following 
@@ -177,6 +235,26 @@ static void rmSpeakerReset(CONTROLLER_T * CtlP, unsigned long model);
 static unsigned char GetLineNumber(int ctrl, int aiop, int ch);
 static unsigned char SetLineNumber(int ctrl, int aiop, int ch);
 static void rp_start(struct tty_struct *tty);
+static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
+                     int ChanNum);
+static void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode);
+static void sFlushRxFIFO(CHANNEL_T * ChP);
+static void sFlushTxFIFO(CHANNEL_T * ChP);
+static void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags);
+static void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags);
+static void sModemReset(CONTROLLER_T * CtlP, int chan, int on);
+static void sPCIModemReset(CONTROLLER_T * CtlP, int chan, int on);
+static int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data);
+static int sPCIInitController(CONTROLLER_T * CtlP, int CtlNum,
+                              ByteIO_t * AiopIOList, int AiopIOListSize,
+                              WordIO_t ConfigIO, int IRQNum, Byte_t Frequency,
+                              int PeriodicOnly, int altChanRingIndicator,
+                              int UPCIRingInd);
+static int sInitController(CONTROLLER_T * CtlP, int CtlNum, ByteIO_t MudbacIO,
+                           ByteIO_t * AiopIOList, int AiopIOListSize,
+                           int IRQNum, Byte_t Frequency, int PeriodicOnly);
+static int sReadAiopID(ByteIO_t io);
+static int sReadAiopNumChan(WordIO_t io);
 #ifdef MODULE
 MODULE_AUTHOR("Theodore Ts'o");
@@ -1798,7 +1876,7 @@ static void rp_flush_buffer(struct tty_struct *tty)
 *  init's aiopic and serial port hardware.
 *  Inputs:  i is the board number (0-n)
 */
-__init int register_PCI(int i, struct pci_dev *dev)
+static __init int register_PCI(int i, struct pci_dev *dev)
 {
        int num_aiops, aiop, max_num_aiops, num_chan, chan;
        unsigned int aiopio[MAX_AIOPS_PER_BOARD];
@@ -2453,72 +2531,6 @@ static void rp_cleanup_module(void)
 }
 #endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-static Byte_t RData[RDATASIZE] = {
-        0x00, 0x09, 0xf6, 0x82,
-        0x02, 0x09, 0x86, 0xfb,
-        0x04, 0x09, 0x00, 0x0a,
-        0x06, 0x09, 0x01, 0x0a,
-        0x08, 0x09, 0x8a, 0x13,
-        0x0a, 0x09, 0xc5, 0x11,
-        0x0c, 0x09, 0x86, 0x85,
-        0x0e, 0x09, 0x20, 0x0a,
-        0x10, 0x09, 0x21, 0x0a,
-        0x12, 0x09, 0x41, 0xff,
-        0x14, 0x09, 0x82, 0x00,
-        0x16, 0x09, 0x82, 0x7b,
-        0x18, 0x09, 0x8a, 0x7d,
-        0x1a, 0x09, 0x88, 0x81,
-        0x1c, 0x09, 0x86, 0x7a,
-        0x1e, 0x09, 0x84, 0x81,
-        0x20, 0x09, 0x82, 0x7c,
-        0x22, 0x09, 0x0a, 0x0a
-};
-static Byte_t RRegData[RREGDATASIZE] = {
-        0x00, 0x09, 0xf6, 0x82, /* 00: Stop Rx processor */
-        0x08, 0x09, 0x8a, 0x13, /* 04: Tx software flow control */
-        0x0a, 0x09, 0xc5, 0x11, /* 08: XON char */
-        0x0c, 0x09, 0x86, 0x85, /* 0c: XANY */
-        0x12, 0x09, 0x41, 0xff, /* 10: Rx mask char */
-        0x14, 0x09, 0x82, 0x00, /* 14: Compare/Ignore #0 */
-        0x16, 0x09, 0x82, 0x7b, /* 18: Compare #1 */
-        0x18, 0x09, 0x8a, 0x7d, /* 1c: Compare #2 */
-        0x1a, 0x09, 0x88, 0x81, /* 20: Interrupt #1 */
-        0x1c, 0x09, 0x86, 0x7a, /* 24: Ignore/Replace #1 */
-        0x1e, 0x09, 0x84, 0x81, /* 28: Interrupt #2 */
-        0x20, 0x09, 0x82, 0x7c, /* 2c: Ignore/Replace #2 */
-        0x22, 0x09, 0x0a, 0x0a  /* 30: Rx FIFO Enable */
-};
-CONTROLLER_T sController[CTL_SIZE] = {
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}}
-};
-Byte_t sBitMapClrTbl[8] = {
-        0xfe, 0xfd, 0xfb, 0xf7, 0xef, 0xdf, 0xbf, 0x7f
-};
-Byte_t sBitMapSetTbl[8] = {
-        0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-};
-int sClockPrescale = 0x14;
 /***************************************************************************
 Function: sInitController
 Purpose:  Initialization of controller global registers and controller
@@ -2554,22 +2566,22 @@ Call:     sInitController(CtlP,CtlNum,MudbacIO,AiopIOList,AiopIOListSize,
                      FREQ_4HZ - 4 Hertz
                   If IRQNum is set to 0 the Frequency parameter is
                   overidden, it is forced to a value of FREQ_DIS.
-          int PeriodicOnly: TRUE if all interrupts except the periodic
+          int PeriodicOnly: 1 if all interrupts except the periodic
                               interrupt are to be blocked.
-                            FALSE is both the periodic interrupt and
+                            0 is both the periodic interrupt and
                               other channel interrupts are allowed.
                            If IRQNum is set to 0 the PeriodicOnly parameter is
-                               overidden, it is forced to a value of FALSE.
+                               overidden, it is forced to a value of 0.
 Return:   int: Number of AIOPs on the controller, or CTLID_NULL if controller
               initialization failed.
 Comments:
          If periodic interrupts are to be disabled but AIOP interrupts
-          are allowed, set Frequency to FREQ_DIS and PeriodicOnly to FALSE.
+          are allowed, set Frequency to FREQ_DIS and PeriodicOnly to 0.
          If interrupts are to be completely disabled set IRQNum to 0.
-          Setting Frequency to FREQ_DIS and PeriodicOnly to TRUE is an
+          Setting Frequency to FREQ_DIS and PeriodicOnly to 1 is an
          invalid combination.
          This function performs initialization of global interrupt modes,
@@ -2589,9 +2601,9 @@ Warnings: No range checking on any of the parameters is done.
          After this function all AIOPs on the controller are disabled,
          they can be enabled with sEnAiop().
 */
-int sInitController(CONTROLLER_T * CtlP, int CtlNum, ByteIO_t MudbacIO,
+static int sInitController(CONTROLLER_T * CtlP, int CtlNum, ByteIO_t MudbacIO,
-                    ByteIO_t * AiopIOList, int AiopIOListSize, int IRQNum,
+                           ByteIO_t * AiopIOList, int AiopIOListSize,
-                    Byte_t Frequency, int PeriodicOnly)
+                           int IRQNum, Byte_t Frequency, int PeriodicOnly)
 {
        int i;
        ByteIO_t io;
@@ -2687,22 +2699,22 @@ Call:     sPCIInitController(CtlP,CtlNum,AiopIOList,AiopIOListSize,
                      FREQ_4HZ - 4 Hertz
                   If IRQNum is set to 0 the Frequency parameter is
                   overidden, it is forced to a value of FREQ_DIS.
-          int PeriodicOnly: TRUE if all interrupts except the periodic
+          int PeriodicOnly: 1 if all interrupts except the periodic
                               interrupt are to be blocked.
-                            FALSE is both the periodic interrupt and
+                            0 is both the periodic interrupt and
                               other channel interrupts are allowed.
                            If IRQNum is set to 0 the PeriodicOnly parameter is
-                               overidden, it is forced to a value of FALSE.
+                               overidden, it is forced to a value of 0.
 Return:   int: Number of AIOPs on the controller, or CTLID_NULL if controller
               initialization failed.
 Comments:
          If periodic interrupts are to be disabled but AIOP interrupts
-          are allowed, set Frequency to FREQ_DIS and PeriodicOnly to FALSE.
+          are allowed, set Frequency to FREQ_DIS and PeriodicOnly to 0.
          If interrupts are to be completely disabled set IRQNum to 0.
-          Setting Frequency to FREQ_DIS and PeriodicOnly to TRUE is an
+          Setting Frequency to FREQ_DIS and PeriodicOnly to 1 is an
          invalid combination.
          This function performs initialization of global interrupt modes,
@@ -2722,11 +2734,11 @@ Warnings: No range checking on any of the parameters is done.
          After this function all AIOPs on the controller are disabled,
          they can be enabled with sEnAiop().
 */
-int sPCIInitController(CONTROLLER_T * CtlP, int CtlNum,
+static int sPCIInitController(CONTROLLER_T * CtlP, int CtlNum,
-                       ByteIO_t * AiopIOList, int AiopIOListSize,
+                              ByteIO_t * AiopIOList, int AiopIOListSize,
-                       WordIO_t ConfigIO, int IRQNum, Byte_t Frequency,
+                              WordIO_t ConfigIO, int IRQNum, Byte_t Frequency,
-                       int PeriodicOnly, int altChanRingIndicator,
+                              int PeriodicOnly, int altChanRingIndicator,
-                       int UPCIRingInd)
+                              int UPCIRingInd)
 {
        int i;
        ByteIO_t io;
@@ -2784,7 +2796,7 @@ Return:   int: Flag AIOPID_XXXX if a valid AIOP is found, where X
 Warnings: No context switches are allowed while executing this function.
 */
-int sReadAiopID(ByteIO_t io)
+static int sReadAiopID(ByteIO_t io)
 {
        Byte_t AiopID;          /* ID byte from AIOP */
@@ -2810,7 +2822,7 @@ Comments: The number of channels is determined by write/reads from identical
          AIOP, otherwise it is an 8 channel.
 Warnings: No context switches are allowed while executing this function.
 */
-int sReadAiopNumChan(WordIO_t io)
+static int sReadAiopNumChan(WordIO_t io)
 {
        Word_t x;
        static Byte_t R[4] = { 0x00, 0x00, 0x34, 0x12 };
@@ -2834,15 +2846,15 @@ Call:     sInitChan(CtlP,ChP,AiopNum,ChanNum)
          CHANNEL_T *ChP; Ptr to channel structure
          int AiopNum; AIOP number within controller
          int ChanNum; Channel number within AIOP
-Return:   int: TRUE if initialization succeeded, FALSE if it fails because channel
+Return:   int: 1 if initialization succeeded, 0 if it fails because channel
               number exceeds number of channels available in AIOP.
 Comments: This function must be called before a channel can be used.
 Warnings: No range checking on any of the parameters is done.
          No context switches are allowed while executing this function.
 */
-int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
+static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
-              int ChanNum)
+                     int ChanNum)
 {
        int i;
        WordIO_t AiopIO;
@@ -2853,7 +2865,7 @@ int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
        int brd9600;
        if (ChanNum >= CtlP->AiopNumChan[AiopNum])
-                return (FALSE); /* exceeds num chans in AIOP */
+                return 0;       /* exceeds num chans in AIOP */
        /* Channel, AIOP, and controller identifiers */
        ChP->CtlP = CtlP;
@@ -2968,7 +2980,7 @@ int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
        ChP->TxPrioBuf = ChOff + _TXP_BUF;
        sEnRxProcessor(ChP);    /* start the Rx processor */
-        return (TRUE);
+        return 1;
 }
 /***************************************************************************
@@ -2989,7 +3001,7 @@ Warnings: No context switches are allowed while executing this function.
          After calling this function a delay of 4 uS is required to ensure
          that the receive processor is no longer processing this channel.
 */
-void sStopRxProcessor(CHANNEL_T * ChP)
+static void sStopRxProcessor(CHANNEL_T * ChP)
 {
        Byte_t R[4];
@@ -3014,18 +3026,18 @@ Comments: To prevent data from being enqueued or dequeued in the Tx FIFO
          this function.
 Warnings: No context switches are allowed while executing this function.
 */
-void sFlushRxFIFO(CHANNEL_T * ChP)
+static void sFlushRxFIFO(CHANNEL_T * ChP)
 {
        int i;
        Byte_t Ch;              /* channel number within AIOP */
-        int RxFIFOEnabled;      /* TRUE if Rx FIFO enabled */
+        int RxFIFOEnabled;      /* 1 if Rx FIFO enabled */
        if (sGetRxCnt(ChP) == 0)        /* Rx FIFO empty */
                return;         /* don't need to flush */
-        RxFIFOEnabled = FALSE;
+        RxFIFOEnabled = 0;
        if (ChP->R[0x32] == 0x08) {     /* Rx FIFO is enabled */
-                RxFIFOEnabled = TRUE;
+                RxFIFOEnabled = 1;
                sDisRxFIFO(ChP);        /* disable it */
                for (i = 0; i < 2000 / 200; i++)        /* delay 2 uS to allow proc to disable FIFO */
                        sInB(ChP->IntChan);     /* depends on bus i/o timing */
@@ -3056,18 +3068,18 @@ Comments: To prevent data from being enqueued or dequeued in the Tx FIFO
          this function.
 Warnings: No context switches are allowed while executing this function.
 */
-void sFlushTxFIFO(CHANNEL_T * ChP)
+static void sFlushTxFIFO(CHANNEL_T * ChP)
 {
        int i;
        Byte_t Ch;              /* channel number within AIOP */
-        int TxEnabled;          /* TRUE if transmitter enabled */
+        int TxEnabled;          /* 1 if transmitter enabled */
        if (sGetTxCnt(ChP) == 0)        /* Tx FIFO empty */
                return;         /* don't need to flush */
-        TxEnabled = FALSE;
+        TxEnabled = 0;
        if (ChP->TxControl[3] & TX_ENABLE) {
-                TxEnabled = TRUE;
+                TxEnabled = 1;
                sDisTransmit(ChP);      /* disable transmitter */
        }
        sStopRxProcessor(ChP);  /* stop Rx processor */
@@ -3096,7 +3108,7 @@ Comments: The priority byte is transmitted before any data in the Tx FIFO.
 Warnings: No context switches are allowed while executing this function.
 */
-int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data)
+static int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data)
 {
        Byte_t DWBuf[4];        /* buffer for double word writes */
        Word_t *WordPtr;        /* must be far because Win SS != DS */
@@ -3158,7 +3170,7 @@ Comments: If an interrupt enable flag is set in Flags, that interrupt will be
          enable channel interrupts.  This would allow the global interrupt
          status register to be used to determine which AIOPs need service.
 */
-void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags)
+static void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags)
 {
        Byte_t Mask;            /* Interrupt Mask Register */
@@ -3202,7 +3214,7 @@ Comments: If an interrupt flag is set in Flags, that interrupt will be
          this channel's bit from being set in the AIOP's Interrupt Channel
          Register.
 */
-void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags)
+static void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags)
 {
        Byte_t Mask;            /* Interrupt Mask Register */
@@ -3218,7 +3230,7 @@ void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags)
        }
 }
-void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode)
+static void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode)
 {
        sOutB(ChP->CtlP->AiopIO[2], (mode & 0x18) | ChP->ChanNum);
 }
@@ -3227,7 +3239,7 @@ void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode)
 *  Not an official SSCI function, but how to reset RocketModems.
 *  ISA bus version
 */
-void sModemReset(CONTROLLER_T * CtlP, int chan, int on)
+static void sModemReset(CONTROLLER_T * CtlP, int chan, int on)
 {
        ByteIO_t addr;
        Byte_t val;
@@ -3252,7 +3264,7 @@ void sModemReset(CONTROLLER_T * CtlP, int chan, int on)
 *  Not an official SSCI function, but how to reset RocketModems.
 *  PCI bus version
 */
-void sPCIModemReset(CONTROLLER_T * CtlP, int chan, int on)
+static void sPCIModemReset(CONTROLLER_T * CtlP, int chan, int on)
 {
        ByteIO_t addr;
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 802687290ee1..3a8bcc85bc14 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -1130,46 +1130,6 @@ Warnings: This function writes the data byte without checking to see if
 */
 #define sWriteTxByte(IO,DATA) sOutB(IO,DATA)
-int sInitController(CONTROLLER_T * CtlP,
-                    int CtlNum,
-                    ByteIO_t MudbacIO,
-                    ByteIO_t * AiopIOList,
-                    int AiopIOListSize,
-                    int IRQNum, Byte_t Frequency, int PeriodicOnly);
-int sPCIInitController(CONTROLLER_T * CtlP,
-                       int CtlNum,
-                       ByteIO_t * AiopIOList,
-                       int AiopIOListSize,
-                       WordIO_t ConfigIO,
-                       int IRQNum,
-                       Byte_t Frequency,
-                       int PeriodicOnly,
-                       int altChanRingIndicator, int UPCIRingInd);
-int sReadAiopID(ByteIO_t io);
-int sReadAiopNumChan(WordIO_t io);
-int sInitChan(CONTROLLER_T * CtlP,
-              CHANNEL_T * ChP, int AiopNum, int ChanNum);
-Byte_t sGetRxErrStatus(CHANNEL_T * ChP);
-void sStopRxProcessor(CHANNEL_T * ChP);
-void sStopSWInFlowCtl(CHANNEL_T * ChP);
-void sFlushRxFIFO(CHANNEL_T * ChP);
-void sFlushTxFIFO(CHANNEL_T * ChP);
-int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data);
-void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags);
-void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags);
-void sModemReset(CONTROLLER_T * CtlP, int chan, int on);
-void sPCIModemReset(CONTROLLER_T * CtlP, int chan, int on);
-void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode);
-extern Byte_t R[RDATASIZE];
-extern CONTROLLER_T sController[CTL_SIZE];
-extern Byte_t sIRQMap[16];
-extern Byte_t sBitMapClrTbl[8];
-extern Byte_t sBitMapSetTbl[8];
-extern int sClockPrescale;
 /*
 * Begin Linux specific definitions for the Rocketport driver
 *
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index f59f7cbd525b..af79805b5576 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/vt_kern.h>
 #include <linux/workqueue.h>
+#include <linux/kexec.h>
 #include <asm/ptrace.h>
@@ -94,6 +95,21 @@ static struct sysrq_key_op sysrq_unraw_op = {
 };
 #endif /* CONFIG_VT */
+#ifdef CONFIG_KEXEC
+/* crashdump sysrq handler */
+static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs,
+                                struct tty_struct *tty)
+{
+        crash_kexec(pt_regs);
+}
+static struct sysrq_key_op sysrq_crashdump_op = {
+        .handler        = sysrq_handle_crashdump,
+        .help_msg       = "Crashdump",
+        .action_msg     = "Trigger a crashdump",
+        .enable_mask    = SYSRQ_ENABLE_DUMP,
+};
+#endif
 /* reboot sysrq handler */
 static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
                                struct tty_struct *tty) 
@@ -273,8 +289,12 @@ static struct sysrq_key_op *sysrq_key_table[SYSRQ_KEY_TABLE_LENGTH] = {
                 it is handled specially on the sparc
                 and will never arrive */
 /* b */ &sysrq_reboot_op,
-/* c */ NULL,
+#ifdef CONFIG_KEXEC
-/* d */ NULL,
+/* c */ &sysrq_crashdump_op,
+#else
+/* c */ NULL,
+#endif
+/* d */ NULL,
 /* e */ &sysrq_term_op,
 /* f */ &sysrq_moom_op,
 /* g */ NULL,
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 58e21fe44262..0c6f521abd0e 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -73,16 +73,20 @@
 #define TOSH_MINOR_DEV 181
-static int tosh_id = 0x0000;
+MODULE_LICENSE("GPL");
-static int tosh_bios = 0x0000;
+MODULE_AUTHOR("Jonathan Buzzard <jonathan@buzzard.org.uk>");
-static int tosh_date = 0x0000;
+MODULE_DESCRIPTION("Toshiba laptop SMM driver");
-static int tosh_sci = 0x0000;
+MODULE_SUPPORTED_DEVICE("toshiba");
-static int tosh_fan = 0;
-static int tosh_fn = 0;
-module_param(tosh_fn, int, 0);
+static int tosh_fn;
+module_param_named(fn, tosh_fn, int, 0);
+MODULE_PARM_DESC(fn, "User specified Fn key detection port");
+static int tosh_id;
+static int tosh_bios;
+static int tosh_date;
+static int tosh_sci;
+static int tosh_fan;
 static int tosh_ioctl(struct inode *, struct file *, unsigned int,
        unsigned long);
@@ -359,7 +363,7 @@ static int tosh_get_machine_id(void)
        unsigned long address;
        id = (0x100*(int) isa_readb(0xffffe))+((int) isa_readb(0xffffa));
-        
        /* do we have a SCTTable machine identication number on our hands */
        if (id==0xfc2f) {
@@ -424,7 +428,7 @@ static int tosh_probe(void)
        }
        /* call the Toshiba SCI support check routine */
-        
        regs.eax = 0xf0f0;
        regs.ebx = 0x0000;
        regs.ecx = 0x0000;
@@ -440,7 +444,7 @@ static int tosh_probe(void)
        /* if we get this far then we are running on a Toshiba (probably)! */
        tosh_sci = regs.edx & 0xffff;
-        
        /* next get the machine ID of the current laptop */
        tosh_id = tosh_get_machine_id();
@@ -475,16 +479,15 @@ static int tosh_probe(void)
        return 0;
 }
-int __init tosh_init(void)
+static int __init toshiba_init(void)
 {
        int retval;
        /* are we running on a Toshiba laptop */
-        if (tosh_probe()!=0)
+        if (tosh_probe())
-                return -EIO;
+                return -ENODEV;
-        printk(KERN_INFO "Toshiba System Managment Mode driver v"
+        printk(KERN_INFO "Toshiba System Managment Mode driver v" TOSH_VERSION "\n");
-                TOSH_VERSION"\n");
        /* set the port to use for Fn status if not specified as a parameter */
        if (tosh_fn==0x00)
@@ -492,12 +495,12 @@ int __init tosh_init(void)
        /* register the device file */
        retval = misc_register(&tosh_device);
-        if(retval < 0)
+        if (retval < 0)
                return retval;
 #ifdef CONFIG_PROC_FS
        /* register the proc entry */
-        if(create_proc_info_entry("toshiba", 0, NULL, tosh_get_info) == NULL){
+        if (create_proc_info_entry("toshiba", 0, NULL, tosh_get_info) == NULL) {
                misc_deregister(&tosh_device);
                return -ENOMEM;
        }
@@ -506,27 +509,12 @@ int __init tosh_init(void)
        return 0;
 }
-#ifdef MODULE
+static void __exit toshiba_exit(void)
-int init_module(void)
-{
-        return tosh_init();
-}
-void cleanup_module(void)
 {
-        /* remove the proc entry */
        remove_proc_entry("toshiba", NULL);
-        /* unregister the device file */
        misc_deregister(&tosh_device);
 }
-#endif
-MODULE_LICENSE("GPL");
+module_init(toshiba_init);
-MODULE_PARM_DESC(tosh_fn, "User specified Fn key detection port");
+module_exit(toshiba_exit);
-MODULE_AUTHOR("Jonathan Buzzard <jonathan@buzzard.org.uk>");
-MODULE_DESCRIPTION("Toshiba laptop SMM driver");
-MODULE_SUPPORTED_DEVICE("toshiba");
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 5c843c9bf819..854475c54f0e 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -233,10 +233,10 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
                    data[15], data[16], data[17], data[22], data[23],
                    data[24], data[25], data[26], data[27], data[28],
                    data[29], data[30], data[31], data[32], data[33],
-                    be32_to_cpu(*((__be32 *) (data + 32))));
+                    be32_to_cpu(*((__be32 *) (data + 34))));
        for (i = 0; i < 256; i++) {
-                str += sprintf(str, "%02X ", data[i + 39]);
+                str += sprintf(str, "%02X ", data[i + 38]);
                if ((i + 1) % 16 == 0)
                        str += sprintf(str, "\n");
        }
@@ -464,6 +464,7 @@ void __devexit tpm_remove(struct pci_dev *pci_dev)
        pci_set_drvdata(pci_dev, NULL);
        misc_deregister(&chip->vendor->miscdev);
+        kfree(&chip->vendor->miscdev.name);
        sysfs_remove_group(&pci_dev->dev.kobj, chip->vendor->attr_group);
@@ -526,7 +527,9 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume);
 int tpm_register_hardware(struct pci_dev *pci_dev,
                          struct tpm_vendor_specific *entry)
 {
-        char devname[7];
+#define DEVNAME_SIZE 7
+        char *devname;
        struct tpm_chip *chip;
        int i, j;
@@ -569,7 +572,8 @@ dev_num_search_complete:
        else
                chip->vendor->miscdev.minor = MISC_DYNAMIC_MINOR;
-        snprintf(devname, sizeof(devname), "%s%d", "tpm", chip->dev_num);
+        devname = kmalloc(DEVNAME_SIZE, GFP_KERNEL);
+        scnprintf(devname, DEVNAME_SIZE, "%s%d", "tpm", chip->dev_num);
        chip->vendor->miscdev.name = devname;
        chip->vendor->miscdev.dev = &(pci_dev->dev);
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 10cb450191a6..373b41f6b460 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -31,8 +31,8 @@ enum tpm_timeout {
 /* TPM addresses */
 enum tpm_addr {
+        TPM_SUPERIO_ADDR = 0x2E,
        TPM_ADDR = 0x4E,
-        TPM_DATA = 0x4F
 };
 extern ssize_t tpm_show_pubek(struct device *, struct device_attribute *attr,
@@ -79,16 +79,16 @@ struct tpm_chip {
        struct list_head list;
 };
-static inline int tpm_read_index(int index)
+static inline int tpm_read_index(int base, int index)
 {
-        outb(index, TPM_ADDR);
+        outb(index, base);
-        return inb(TPM_DATA) & 0xFF;
+        return inb(base+1) & 0xFF;
 }
-static inline void tpm_write_index(int index, int value)
+static inline void tpm_write_index(int base, int index, int value)
 {
-        outb(index, TPM_ADDR);
+        outb(index, base);
-        outb(value & 0xFF, TPM_DATA);
+        outb(value & 0xFF, base+1);
 }
 extern int tpm_register_hardware(struct pci_dev *,
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index 61fe14a77124..cc2cc77fd174 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -163,24 +163,24 @@ static int __devinit tpm_atml_init(struct pci_dev *pci_dev,
        if (pci_enable_device(pci_dev))
                return -EIO;
-        lo = tpm_read_index( TPM_ATMEL_BASE_ADDR_LO );
+        lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO);
-        hi = tpm_read_index( TPM_ATMEL_BASE_ADDR_HI );
+        hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI);
        tpm_atmel.base = (hi<<8)|lo;
        dev_dbg( &pci_dev->dev, "Operating with base: 0x%x\n", tpm_atmel.base);
        /* verify that it is an Atmel part */
-        if (tpm_read_index(4) != 'A' || tpm_read_index(5) != 'T'
+        if (tpm_read_index(TPM_ADDR, 4) != 'A' || tpm_read_index(TPM_ADDR, 5) != 'T'
-            || tpm_read_index(6) != 'M' || tpm_read_index(7) != 'L') {
+            || tpm_read_index(TPM_ADDR, 6) != 'M' || tpm_read_index(TPM_ADDR, 7) != 'L') {
                rc = -ENODEV;
                goto out_err;
        }
        /* query chip for its version number */
-        if ((version[0] = tpm_read_index(0x00)) != 0xFF) {
+        if ((version[0] = tpm_read_index(TPM_ADDR, 0x00)) != 0xFF) {
-                version[1] = tpm_read_index(0x01);
+                version[1] = tpm_read_index(TPM_ADDR, 0x01);
-                version[2] = tpm_read_index(0x02);
+                version[2] = tpm_read_index(TPM_ADDR, 0x02);
-                version[3] = tpm_read_index(0x03);
+                version[3] = tpm_read_index(TPM_ADDR, 0x03);
        } else {
                dev_info(&pci_dev->dev, "version query failed\n");
                rc = -ENODEV;
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index 1a45e7dfc13b..b4127348c063 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -23,7 +23,6 @@
 /* National definitions */
 enum tpm_nsc_addr{
-        TPM_NSC_BASE = 0x360,
        TPM_NSC_IRQ = 0x07,
        TPM_NSC_BASE0_HI = 0x60,
        TPM_NSC_BASE0_LO = 0x61,
@@ -56,6 +55,7 @@ enum tpm_nsc_status {
        NSC_STATUS_RDY = 0x10,  /* ready to receive command */
        NSC_STATUS_IBR = 0x20   /* ready to receive data */
 };
 /* command bits */
 enum tpm_nsc_cmd_mode {
        NSC_COMMAND_NORMAL = 0x01,      /* normal mode */
@@ -150,7 +150,8 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
                *p = inb(chip->vendor->base + NSC_DATA);
        }
-        if ((data & NSC_STATUS_F0) == 0) {
+        if ((data & NSC_STATUS_F0) == 0 &&
+        (wait_for_stat(chip, NSC_STATUS_F0, NSC_STATUS_F0, &data) < 0)) {
                dev_err(&chip->pci_dev->dev, "F0 not set\n");
                return -EIO;
        }
@@ -259,85 +260,64 @@ static int __devinit tpm_nsc_init(struct pci_dev *pci_dev,
 {
        int rc = 0;
        int lo, hi;
+        int nscAddrBase = TPM_ADDR;
-        hi = tpm_read_index(TPM_NSC_BASE0_HI);
-        lo = tpm_read_index(TPM_NSC_BASE0_LO);
-        tpm_nsc.base = (hi<<8) | lo;
        if (pci_enable_device(pci_dev))
                return -EIO;
+        /* select PM channel 1 */
+        tpm_write_index(nscAddrBase,NSC_LDN_INDEX, 0x12);
        /* verify that it is a National part (SID) */
-        if (tpm_read_index(NSC_SID_INDEX) != 0xEF) {
+        if (tpm_read_index(TPM_ADDR, NSC_SID_INDEX) != 0xEF) {
-                rc = -ENODEV;
+                nscAddrBase = (tpm_read_index(TPM_SUPERIO_ADDR, 0x2C)<<8)|
-                goto out_err;
+                        (tpm_read_index(TPM_SUPERIO_ADDR, 0x2B)&0xFE);
+                if (tpm_read_index(nscAddrBase, NSC_SID_INDEX) != 0xF6) {
+                        rc = -ENODEV;
+                        goto out_err;
+                }
        }
+        hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI);
+        lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO);
+        tpm_nsc.base = (hi<<8) | lo;
        dev_dbg(&pci_dev->dev, "NSC TPM detected\n");
        dev_dbg(&pci_dev->dev,
                "NSC LDN 0x%x, SID 0x%x, SRID 0x%x\n",
-                tpm_read_index(0x07), tpm_read_index(0x20),
+                tpm_read_index(nscAddrBase,0x07), tpm_read_index(nscAddrBase,0x20),
-                tpm_read_index(0x27));
+                tpm_read_index(nscAddrBase,0x27));
        dev_dbg(&pci_dev->dev,
                "NSC SIOCF1 0x%x SIOCF5 0x%x SIOCF6 0x%x SIOCF8 0x%x\n",
-                tpm_read_index(0x21), tpm_read_index(0x25),
+                tpm_read_index(nscAddrBase,0x21), tpm_read_index(nscAddrBase,0x25),
-                tpm_read_index(0x26), tpm_read_index(0x28));
+                tpm_read_index(nscAddrBase,0x26), tpm_read_index(nscAddrBase,0x28));
        dev_dbg(&pci_dev->dev, "NSC IO Base0 0x%x\n",
-                (tpm_read_index(0x60) << 8) | tpm_read_index(0x61));
+                (tpm_read_index(nscAddrBase,0x60) << 8) | tpm_read_index(nscAddrBase,0x61));
        dev_dbg(&pci_dev->dev, "NSC IO Base1 0x%x\n",
-                (tpm_read_index(0x62) << 8) | tpm_read_index(0x63));
+                (tpm_read_index(nscAddrBase,0x62) << 8) | tpm_read_index(nscAddrBase,0x63));
        dev_dbg(&pci_dev->dev, "NSC Interrupt number and wakeup 0x%x\n",
-                tpm_read_index(0x70));
+                tpm_read_index(nscAddrBase,0x70));
        dev_dbg(&pci_dev->dev, "NSC IRQ type select 0x%x\n",
-                tpm_read_index(0x71));
+                tpm_read_index(nscAddrBase,0x71));
        dev_dbg(&pci_dev->dev,
                "NSC DMA channel select0 0x%x, select1 0x%x\n",
-                tpm_read_index(0x74), tpm_read_index(0x75));
+                tpm_read_index(nscAddrBase,0x74), tpm_read_index(nscAddrBase,0x75));
        dev_dbg(&pci_dev->dev,
                "NSC Config "
                "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
-                tpm_read_index(0xF0), tpm_read_index(0xF1),
+                tpm_read_index(nscAddrBase,0xF0), tpm_read_index(nscAddrBase,0xF1),
-                tpm_read_index(0xF2), tpm_read_index(0xF3),
+                tpm_read_index(nscAddrBase,0xF2), tpm_read_index(nscAddrBase,0xF3),
-                tpm_read_index(0xF4), tpm_read_index(0xF5),
+                tpm_read_index(nscAddrBase,0xF4), tpm_read_index(nscAddrBase,0xF5),
-                tpm_read_index(0xF6), tpm_read_index(0xF7),
+                tpm_read_index(nscAddrBase,0xF6), tpm_read_index(nscAddrBase,0xF7),
-                tpm_read_index(0xF8), tpm_read_index(0xF9));
+                tpm_read_index(nscAddrBase,0xF8), tpm_read_index(nscAddrBase,0xF9));
        dev_info(&pci_dev->dev,
-                 "NSC PC21100 TPM revision %d\n",
+                 "NSC TPM revision %d\n",
-                 tpm_read_index(0x27) & 0x1F);
+                 tpm_read_index(nscAddrBase, 0x27) & 0x1F);
-        if (tpm_read_index(NSC_LDC_INDEX) == 0)
-                dev_info(&pci_dev->dev, ": NSC TPM not active\n");
-        /* select PM channel 1 */
-        tpm_write_index(NSC_LDN_INDEX, 0x12);
-        tpm_read_index(NSC_LDN_INDEX);
-        /* disable the DPM module */
-        tpm_write_index(NSC_LDC_INDEX, 0);
-        tpm_read_index(NSC_LDC_INDEX);
-        /* set the data register base addresses */
-        tpm_write_index(NSC_DIO_INDEX, TPM_NSC_BASE >> 8);
-        tpm_write_index(NSC_DIO_INDEX + 1, TPM_NSC_BASE);
-        tpm_read_index(NSC_DIO_INDEX);
-        tpm_read_index(NSC_DIO_INDEX + 1);
-        /* set the command register base addresses */
-        tpm_write_index(NSC_CIO_INDEX, (TPM_NSC_BASE + 1) >> 8);
-        tpm_write_index(NSC_CIO_INDEX + 1, (TPM_NSC_BASE + 1));
-        tpm_read_index(NSC_DIO_INDEX);
-        tpm_read_index(NSC_DIO_INDEX + 1);
-        /* set the interrupt number to be used for the host interface */
-        tpm_write_index(NSC_IRQ_INDEX, TPM_NSC_IRQ);
-        tpm_write_index(NSC_ITS_INDEX, 0x00);
-        tpm_read_index(NSC_IRQ_INDEX);
        /* enable the DPM module */
-        tpm_write_index(NSC_LDC_INDEX, 0x01);
+        tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01);
-        tpm_read_index(NSC_LDC_INDEX);
        if ((rc = tpm_register_hardware(pci_dev, &tpm_nsc)) < 0)
                goto out_err;
@@ -355,6 +335,9 @@ static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0)},
        {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
        {0,}
 };
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index cc4b43bad703..6e4be3bb2d89 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -94,6 +94,7 @@
 #include <linux/idr.h>
 #include <linux/wait.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -2180,12 +2181,11 @@ static int tiocsetd(struct tty_struct *tty, int __user *p)
        return tty_set_ldisc(tty, ldisc);
 }
-static int send_break(struct tty_struct *tty, int duration)
+static int send_break(struct tty_struct *tty, unsigned int duration)
 {
        tty->driver->break_ctl(tty, -1);
        if (!signal_pending(current)) {
-                set_current_state(TASK_INTERRUPTIBLE);
+                msleep_interruptible(duration);
-                schedule_timeout(duration);
        }
        tty->driver->break_ctl(tty, 0);
        if (signal_pending(current))
@@ -2366,10 +2366,10 @@ int tty_ioctl(struct inode * inode, struct file * file,
                         * all by anyone?
                         */
                        if (!arg)
-                                return send_break(tty, HZ/4);
+                                return send_break(tty, 250);
                        return 0;
                case TCSBRKP:   /* support for POSIX tcsendbreak() */   
-                        return send_break(tty, arg ? arg*(HZ/10) : HZ/4);
+                        return send_break(tty, arg ? arg*100 : 250);
                case TIOCMGET:
                        return tty_tiocmget(tty, file, p);
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index a3451cb94004..33b17c6a46fb 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -618,8 +618,8 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
        new_efivar = kmalloc(sizeof(struct efivar_entry), GFP_KERNEL);
        if (!short_name || !new_efivar)  {
-                if (short_name)        kfree(short_name);
+                kfree(short_name);
-                if (new_efivar)        kfree(new_efivar);
+                kfree(new_efivar);
                return 1;
        }
        memset(short_name, 0, short_name_size+1);
@@ -644,7 +644,8 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
        kobj_set_kset_s(new_efivar, vars_subsys);
        kobject_register(&new_efivar->kobj);
-        kfree(short_name); short_name = NULL;
+        kfree(short_name);
+        short_name = NULL;
        spin_lock(&efivars_lock);
        list_add(&new_efivar->list, &efivar_list);
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index d41ca31dbcb2..03c23ce98edb 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -20,13 +20,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#ifdef CONFIG_FSL_OCP
-#include <asm/ocp.h>
-#define FSL_I2C_DEV_SEPARATE_DFSRR FS_I2C_SEPARATE_DFSRR
-#define FSL_I2C_DEV_CLOCK_5200 FS_I2C_CLOCK_5200
-#else
 #include <linux/fsl_devices.h>
-#endif
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
@@ -294,204 +288,6 @@ static struct i2c_adapter mpc_ops = {
        .retries = 1
 };
-#ifdef CONFIG_FSL_OCP
-static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
-{
-        int result = 0;
-        struct mpc_i2c *i2c;
-        if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
-                return -ENOMEM;
-        }
-        memset(i2c, 0, sizeof(*i2c));
-        i2c->irq = ocp->def->irq;
-        i2c->flags = ((struct ocp_fs_i2c_data *)ocp->def->additions)->flags;
-        init_waitqueue_head(&i2c->queue);
-        if (!request_mem_region(ocp->def->paddr, MPC_I2C_REGION, "i2c-mpc")) {
-                printk(KERN_ERR "i2c-mpc - resource unavailable\n");
-                return -ENODEV;
-        }
-        i2c->base = ioremap(ocp->def->paddr, MPC_I2C_REGION);
-        if (!i2c->base) {
-                printk(KERN_ERR "i2c-mpc - failed to map controller\n");
-                result = -ENOMEM;
-                goto fail_map;
-        }
-        if (i2c->irq != OCP_IRQ_NA)
-        {
-                if ((result = request_irq(ocp->def->irq, mpc_i2c_isr,
-                                          SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
-                        printk(KERN_ERR
-                               "i2c-mpc - failed to attach interrupt\n");
-                        goto fail_irq;
-                }
-        } else
-                i2c->irq = 0;
-        mpc_i2c_setclock(i2c);
-        ocp_set_drvdata(ocp, i2c);
-        i2c->adap = mpc_ops;
-        i2c_set_adapdata(&i2c->adap, i2c);
-        if ((result = i2c_add_adapter(&i2c->adap)) < 0) {
-                printk(KERN_ERR "i2c-mpc - failed to add adapter\n");
-                goto fail_add;
-        }
-        return result;
-      fail_add:
-        if (ocp->def->irq != OCP_IRQ_NA)
-                free_irq(ocp->def->irq, 0);
-      fail_irq:
-        iounmap(i2c->base);
-      fail_map:
-        release_mem_region(ocp->def->paddr, MPC_I2C_REGION);
-        kfree(i2c);
-        return result;
-}
-static void __devexit mpc_i2c_remove(struct ocp_device *ocp)
-{
-        struct mpc_i2c *i2c = ocp_get_drvdata(ocp);
-        i2c_del_adapter(&i2c->adap);
-        ocp_set_drvdata(ocp, NULL);
-        if (ocp->def->irq != OCP_IRQ_NA)
-                free_irq(i2c->irq, i2c);
-        iounmap(i2c->base);
-        release_mem_region(ocp->def->paddr, MPC_I2C_REGION);
-        kfree(i2c);
-}
-static struct ocp_device_id mpc_iic_ids[] __devinitdata = {
-        {.vendor = OCP_VENDOR_FREESCALE,.function = OCP_FUNC_IIC},
-        {.vendor = OCP_VENDOR_INVALID}
-};
-MODULE_DEVICE_TABLE(ocp, mpc_iic_ids);
-static struct ocp_driver mpc_iic_driver = {
-        .name = "iic",
-        .id_table = mpc_iic_ids,
-        .probe = mpc_i2c_probe,
-        .remove = __devexit_p(mpc_i2c_remove)
-};
-static int __init iic_init(void)
-{
-        return ocp_register_driver(&mpc_iic_driver);
-}
-static void __exit iic_exit(void)
-{
-        ocp_unregister_driver(&mpc_iic_driver);
-}
-module_init(iic_init);
-module_exit(iic_exit);
-#else
-static int fsl_i2c_probe(struct device *device)
-{
-        int result = 0;
-        struct mpc_i2c *i2c;
-        struct platform_device *pdev = to_platform_device(device);
-        struct fsl_i2c_platform_data *pdata;
-        struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;
-        if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
-                return -ENOMEM;
-        }
-        memset(i2c, 0, sizeof(*i2c));
-        i2c->irq = platform_get_irq(pdev, 0);
-        i2c->flags = pdata->device_flags;
-        init_waitqueue_head(&i2c->queue);
-        i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION);
-        if (!i2c->base) {
-                printk(KERN_ERR "i2c-mpc - failed to map controller\n");
-                result = -ENOMEM;
-                goto fail_map;
-        }
-        if (i2c->irq != 0)
-                if ((result = request_irq(i2c->irq, mpc_i2c_isr,
-                                          SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
-                        printk(KERN_ERR
-                               "i2c-mpc - failed to attach interrupt\n");
-                        goto fail_irq;
-                }
-        mpc_i2c_setclock(i2c);
-        dev_set_drvdata(device, i2c);
-        i2c->adap = mpc_ops;
-        i2c_set_adapdata(&i2c->adap, i2c);
-        i2c->adap.dev.parent = &pdev->dev;
-        if ((result = i2c_add_adapter(&i2c->adap)) < 0) {
-                printk(KERN_ERR "i2c-mpc - failed to add adapter\n");
-                goto fail_add;
-        }
-        return result;
-      fail_add:
-        if (i2c->irq != 0)
-                free_irq(i2c->irq, NULL);
-      fail_irq:
-        iounmap(i2c->base);
-      fail_map:
-        kfree(i2c);
-        return result;
-};
-static int fsl_i2c_remove(struct device *device)
-{
-        struct mpc_i2c *i2c = dev_get_drvdata(device);
-        i2c_del_adapter(&i2c->adap);
-        dev_set_drvdata(device, NULL);
-        if (i2c->irq != 0)
-                free_irq(i2c->irq, i2c);
-        iounmap(i2c->base);
-        kfree(i2c);
-        return 0;
-};
-/* Structure for a device driver */
-static struct device_driver fsl_i2c_driver = {
-        .name = "fsl-i2c",
-        .bus = &platform_bus_type,
-        .probe = fsl_i2c_probe,
-        .remove = fsl_i2c_remove,
-};
-static int __init fsl_i2c_init(void)
-{
-        return driver_register(&fsl_i2c_driver);
-}
-static void __exit fsl_i2c_exit(void)
-{
-        driver_unregister(&fsl_i2c_driver);
-}
-module_init(fsl_i2c_init);
-module_exit(fsl_i2c_exit);
-#endif /* CONFIG_FSL_OCP */
 MODULE_AUTHOR("Adrian Cox <adrian@humboldt.co.uk>");
 MODULE_DESCRIPTION
    ("I2C-Bus adapter for MPC107 bridge and MPC824x/85xx/52xx processors");
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index 2d9a9b74e687..629070b83a33 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -1041,10 +1041,8 @@ static int hpsbpkt_thread(void *__hi)
        while (1) {
                if (down_interruptible(&khpsbpkt_sig)) {
-                        if (current->flags & PF_FREEZE) {
+                        if (try_to_freeze())
-                                refrigerator(0);
                                continue;
-                        }
                        printk("khpsbpkt: received unexpected signal?!\n" );
                        break;
                }
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 32abb6dda888..9a46c3b44bf8 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1510,7 +1510,7 @@ static int nodemgr_host_thread(void *__hi)
                if (down_interruptible(&hi->reset_sem) ||
                    down_interruptible(&nodemgr_serialize)) {
-                        if (try_to_freeze(PF_FREEZE))
+                        if (try_to_freeze())
                                continue;
                        printk("NodeMgr: received unexpected signal?!\n" );
                        break;
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index e152d0fa0cdd..c77a82e46055 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -439,7 +439,7 @@ static int gameport_thread(void *nothing)
        do {
                gameport_handle_events();
                wait_event_interruptible(gameport_wait, !list_empty(&gameport_event_list));
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
        } while (!signal_pending(current));
        printk(KERN_DEBUG "gameport: kgameportd exiting\n");
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 5900de3c3f4f..a9bf549c8dc5 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -396,7 +396,7 @@ static void i8042_stop(struct serio *serio)
        struct i8042_port *port = serio->port_data;
        port->exists = 0;
-        synchronize_kernel();
+        synchronize_sched();
        port->serio = NULL;
 }
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index feab4970406e..341824c48529 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -344,7 +344,7 @@ static int serio_thread(void *nothing)
        do {
                serio_handle_events();
                wait_event_interruptible(serio_wait, !list_empty(&serio_event_list));
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
        } while (!signal_pending(current));
        printk(KERN_DEBUG "serio: kseriod exiting\n");
diff --git a/drivers/isdn/act2000/capi.c b/drivers/isdn/act2000/capi.c
index 40395f567231..afa46681f983 100644
--- a/drivers/isdn/act2000/capi.c
+++ b/drivers/isdn/act2000/capi.c
@@ -224,6 +224,7 @@ actcapi_manufacturer_req_net(act2000_card *card)
 /*
 * Switch V.42 on or off
 */
+#if 0
 int
 actcapi_manufacturer_req_v42(act2000_card *card, ulong arg)
 {
@@ -242,6 +243,7 @@ actcapi_manufacturer_req_v42(act2000_card *card, ulong arg)
        ACTCAPI_QUEUE_TX;
        return 0;
 }
+#endif  /*  0  */
 /*
 * Set error-handler
diff --git a/drivers/isdn/act2000/capi.h b/drivers/isdn/act2000/capi.h
index 04d2bcdd37a7..f6d5f530b86b 100644
--- a/drivers/isdn/act2000/capi.h
+++ b/drivers/isdn/act2000/capi.h
@@ -350,7 +350,6 @@ actcapi_nextsmsg(act2000_card *card)
 extern int actcapi_chkhdr(act2000_card *, actcapi_msghdr *);
 extern int actcapi_listen_req(act2000_card *);
 extern int actcapi_manufacturer_req_net(act2000_card *);
-extern int actcapi_manufacturer_req_v42(act2000_card *, ulong);
 extern int actcapi_manufacturer_req_errh(act2000_card *);
 extern int actcapi_manufacturer_req_msn(act2000_card *);
 extern int actcapi_connect_req(act2000_card *, act2000_chan *, char *, char, int, int);
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 55bed00ca865..91dd0551fc7c 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -955,7 +955,7 @@ EXPORT_SYMBOL(b1dma_release_appl);
 EXPORT_SYMBOL(b1dma_send_message);
 EXPORT_SYMBOL(b1dmactl_read_proc);
-int b1dma_init(void)
+static int __init b1dma_init(void)
 {
        char *p;
        char rev[32];
@@ -972,7 +972,7 @@ int b1dma_init(void)
        return 0;
 }
-void b1dma_exit(void)
+static void __exit b1dma_exit(void)
 {
 }
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index fa6b93b1a42d..724aac2c1cca 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -885,7 +885,7 @@ static int c4_load_firmware(struct capi_ctr *ctrl, capiloaddata *data)
 }
-void c4_reset_ctr(struct capi_ctr *ctrl)
+static void c4_reset_ctr(struct capi_ctr *ctrl)
 {
        avmcard *card = ((avmctrl_info *)(ctrl->driverdata))->card;
        avmctrl_info *cinfo;
@@ -933,7 +933,7 @@ static void c4_remove(struct pci_dev *pdev)
 /* ------------------------------------------------------------- */
-void c4_register_appl(struct capi_ctr *ctrl,
+static void c4_register_appl(struct capi_ctr *ctrl,
                                u16 appl,
                                capi_register_params *rp)
 {
@@ -978,7 +978,7 @@ void c4_register_appl(struct capi_ctr *ctrl,
 /* ------------------------------------------------------------- */
-void c4_release_appl(struct capi_ctr *ctrl, u16 appl)
+static void c4_release_appl(struct capi_ctr *ctrl, u16 appl)
 {
        avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
        avmcard *card = cinfo->card;
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c
index cb9d9cee2a64..3b701d97bdf1 100644
--- a/drivers/isdn/hardware/avm/t1isa.c
+++ b/drivers/isdn/hardware/avm/t1isa.c
@@ -328,7 +328,7 @@ static int t1isa_load_firmware(struct capi_ctr *ctrl, capiloaddata *data)
        return 0;
 }
-void t1isa_reset_ctr(struct capi_ctr *ctrl)
+static void t1isa_reset_ctr(struct capi_ctr *ctrl)
 {
        avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
        avmcard *card = cinfo->card;
diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile
index 8d6bb56754b8..293e27789d54 100644
--- a/drivers/isdn/hisax/Makefile
+++ b/drivers/isdn/hisax/Makefile
@@ -23,7 +23,7 @@ endif
 # Multipart objects.
 hisax_st5481-y                          := st5481_init.o st5481_usb.o st5481_d.o \
-                                           st5481_b.o st5481_hdlc.o
+                                           st5481_b.o
 hisax-y                                 := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \
                                           lmgr.o q931.o callc.o fsm.o
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c
index c4f861a5db25..8ae08c41c853 100644
--- a/drivers/isdn/hisax/amd7930_fn.c
+++ b/drivers/isdn/hisax/amd7930_fn.c
@@ -97,7 +97,7 @@ static WORD initAMD[] = {
 };
-void /* macro wWordAMD */
+static void /* macro wWordAMD */
 WriteWordAmd7930(struct IsdnCardState *cs, BYTE reg, WORD val)
 {
        wByteAMD(cs, 0x00, reg);
@@ -105,7 +105,7 @@ WriteWordAmd7930(struct IsdnCardState *cs, BYTE reg, WORD val)
        wByteAMD(cs, 0x01, HIBYTE(val));
 }
-WORD /* macro rWordAMD */
+static WORD /* macro rWordAMD */
 ReadWordAmd7930(struct IsdnCardState *cs, BYTE reg)
 {
        WORD res;
@@ -665,7 +665,7 @@ Amd7930_l1hw(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 setstack_Amd7930(struct PStack *st, struct IsdnCardState *cs)
 {
@@ -676,7 +676,7 @@ setstack_Amd7930(struct PStack *st, struct IsdnCardState *cs)
 }
-void
+static void
 DC_Close_Amd7930(struct IsdnCardState *cs) {
        if (cs->debug & L1_DEB_ISAC)
                debugl1(cs, "Amd7930: DC_Close called");
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index 7546e2e4a94e..a98c5e38bbbc 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -22,7 +22,7 @@
 extern const char *CardType[];
-const char *Asuscom_revision = "$Revision: 1.14.2.4 $";
+static const char *Asuscom_revision = "$Revision: 1.14.2.4 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -239,7 +239,7 @@ Start_IPAC:
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_asuscom(struct IsdnCardState *cs)
 {
        int bytecnt = 8;
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 6fcb2cf7b0b6..625799ab0d14 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -172,7 +172,7 @@ struct BCState *Sel_BCS(struct IsdnCardState *cs, int channel)
                return(NULL);
 }
-void
+static void
 write_ctrl(struct BCState *bcs, int which) {
        if (bcs->cs->debug & L1_DEB_HSCX)
@@ -193,7 +193,7 @@ write_ctrl(struct BCState *bcs, int which) {
        }
 }
-void
+static void
 modehdlc(struct BCState *bcs, int mode, int bc)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -451,7 +451,7 @@ HDLC_irq(struct BCState *bcs, u_int stat) {
        }
 }
-inline void
+static inline void
 HDLC_irq_main(struct IsdnCardState *cs)
 {
        u_int stat;
@@ -487,7 +487,7 @@ HDLC_irq_main(struct IsdnCardState *cs)
        }
 }
-void
+static void
 hdlc_l2l1(struct PStack *st, int pr, void *arg)
 {
        struct BCState *bcs = st->l1.bcs;
@@ -547,7 +547,7 @@ hdlc_l2l1(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 close_hdlcstate(struct BCState *bcs)
 {
        modehdlc(bcs, 0, 0);
@@ -570,7 +570,7 @@ close_hdlcstate(struct BCState *bcs)
        }
 }
-int
+static int
 open_hdlcstate(struct IsdnCardState *cs, struct BCState *bcs)
 {
        if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) {
@@ -598,7 +598,7 @@ open_hdlcstate(struct IsdnCardState *cs, struct BCState *bcs)
        return (0);
 }
-int
+static int
 setstack_hdlc(struct PStack *st, struct BCState *bcs)
 {
        bcs->channel = st->l1.bc;
@@ -612,6 +612,7 @@ setstack_hdlc(struct PStack *st, struct BCState *bcs)
        return (0);
 }
+#if 0
 void __init
 clear_pending_hdlc_ints(struct IsdnCardState *cs)
 {
@@ -641,8 +642,9 @@ clear_pending_hdlc_ints(struct IsdnCardState *cs)
                debugl1(cs, "HDLC 2 VIN %x", val);
        }
 }
+#endif  /*  0  */
-void __init
+static void __init
 inithdlc(struct IsdnCardState *cs)
 {
        cs->bcs[0].BC_SetStack = setstack_hdlc;
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c
index f410f628a3e2..dcb308aeb50c 100644
--- a/drivers/isdn/hisax/bkm_a4t.c
+++ b/drivers/isdn/hisax/bkm_a4t.c
@@ -23,7 +23,7 @@
 extern const char *CardType[];
-const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $";
+static const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $";
 static inline u_char
@@ -167,7 +167,7 @@ bkm_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        }
 }
-void
+static void
 release_io_bkm(struct IsdnCardState *cs)
 {
        if (cs->hw.ax.base) {
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c
index 94bb83ce7fd8..5f21b82c8c8d 100644
--- a/drivers/isdn/hisax/bkm_a8.c
+++ b/drivers/isdn/hisax/bkm_a8.c
@@ -27,7 +27,7 @@
 extern const char *CardType[];
-const char sct_quadro_revision[] = "$Revision: 1.22.2.4 $";
+static const char sct_quadro_revision[] = "$Revision: 1.22.2.4 $";
 static const char *sct_quadro_subtypes[] =
 {
@@ -193,7 +193,7 @@ bkm_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_sct_quadro(struct IsdnCardState *cs)
 {
        release_region(cs->hw.ax.base & 0xffffffc0, 128);
@@ -261,7 +261,7 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
        return (0);
 }
-int __init
+static int __init
 sct_alloc_io(u_int adr, u_int len)
 {
        if (!request_region(adr, len, "scitel")) {
diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c
index 04065ab2610f..7c56c44f0fd1 100644
--- a/drivers/isdn/hisax/callc.c
+++ b/drivers/isdn/hisax/callc.c
@@ -874,7 +874,7 @@ release_b_st(struct Channel *chanp)
        } 
 }
-struct Channel
+static struct Channel
 *selectfreechannel(struct PStack *st, int bch)
 {
        struct IsdnCardState *cs = st->l1.hardware;
@@ -1429,7 +1429,7 @@ capi_debug(struct Channel *chanp, capi_msg *cm)
        HiSax_putstatus(chanp->cs, "Ch", "%d CAPIMSG %s", chanp->chan, tmpbuf);
 }
-void
+static void
 lli_got_fac_req(struct Channel *chanp, capi_msg *cm) {
        if ((cm->para[0] != 3) || (cm->para[1] != 0))
                return;
@@ -1454,7 +1454,7 @@ lli_got_fac_req(struct Channel *chanp, capi_msg *cm) {
        }
 }
-void
+static void
 lli_got_manufacturer(struct Channel *chanp, struct IsdnCardState *cs, capi_msg *cm) {
        if ((cs->typ == ISDN_CTYPE_ELSA) || (cs->typ == ISDN_CTYPE_ELSA_PNP) ||
                (cs->typ == ISDN_CTYPE_ELSA_PCI)) {
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 1663ee69d41d..c542e6fb2bde 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -332,7 +332,7 @@ struct IsdnCard cards[HISAX_MAX_CARDS] = {
 #define HISAX_IDSIZE (HISAX_MAX_CARDS*8)
 static char HiSaxID[HISAX_IDSIZE] = { 0, };
-char *HiSax_id = HiSaxID;
+static char *HiSax_id = HiSaxID;
 #ifdef MODULE
 /* Variables for insmod */
 static int type[HISAX_MAX_CARDS] = { 0, };
@@ -391,7 +391,7 @@ char *HiSax_getrev(const char *revision)
        return rev;
 }
-void __init HiSaxVersion(void)
+static void __init HiSaxVersion(void)
 {
        char tmp[64];
@@ -608,6 +608,7 @@ static inline struct IsdnCardState *hisax_findcard(int driverid)
 /*
 * Find card with given card number
 */
+#if 0
 struct IsdnCardState *hisax_get_card(int cardnr)
 {
        if ((cardnr <= nrcards) && (cardnr > 0))
@@ -615,8 +616,9 @@ struct IsdnCardState *hisax_get_card(int cardnr)
                        return cards[cardnr - 1].cs;
        return NULL;
 }
+#endif  /*  0  */
-int HiSax_readstatus(u_char __user *buf, int len, int id, int channel)
+static int HiSax_readstatus(u_char __user *buf, int len, int id, int channel)
 {
        int count, cnt;
        u_char __user *p = buf;
@@ -768,7 +770,7 @@ int ll_run(struct IsdnCardState *cs, int addfeatures)
        return 0;
 }
-void ll_stop(struct IsdnCardState *cs)
+static void ll_stop(struct IsdnCardState *cs)
 {
        isdn_ctrl ic;
@@ -1184,7 +1186,7 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
        return ret;
 }
-void HiSax_shiftcards(int idx)
+static void HiSax_shiftcards(int idx)
 {
        int i;
@@ -1192,7 +1194,7 @@ void HiSax_shiftcards(int idx)
                memcpy(&cards[i], &cards[i + 1], sizeof(cards[i]));
 }
-int HiSax_inithardware(int *busy_flag)
+static int HiSax_inithardware(int *busy_flag)
 {
        int foundcards = 0;
        int i = 0;
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 394d481e093f..b62d6b30b72b 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -28,7 +28,7 @@
 extern const char *CardType[];
-const char *Diva_revision = "$Revision: 1.33.2.6 $";
+static const char *Diva_revision = "$Revision: 1.33.2.6 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -706,7 +706,7 @@ diva_irq_ipacx_pci(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_diva(struct IsdnCardState *cs)
 {
        int bytecnt;
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 4d7a0250d7e2..110e9fd669c5 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -33,13 +33,13 @@
 extern const char *CardType[];
-const char *Elsa_revision = "$Revision: 2.32.2.4 $";
+static const char *Elsa_revision = "$Revision: 2.32.2.4 $";
-const char *Elsa_Types[] =
+static const char *Elsa_Types[] =
 {"None", "PC", "PCC-8", "PCC-16", "PCF", "PCF-Pro",
 "PCMCIA", "QS 1000", "QS 3000", "Microlink PCI", "QS 3000 PCI", 
 "PCMCIA-IPAC" };
-const char *ITACVer[] =
+static const char *ITACVer[] =
 {"?0?", "?1?", "?2?", "?3?", "?4?", "V2.2",
 "B1", "A1"};
@@ -425,7 +425,7 @@ Start_IPAC:
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_elsa(struct IsdnCardState *cs)
 {
        int bytecnt = 8;
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
index 689c83395693..898ec0916195 100644
--- a/drivers/isdn/hisax/elsa_ser.c
+++ b/drivers/isdn/hisax/elsa_ser.c
@@ -237,7 +237,7 @@ static void mshutdown(struct IsdnCardState *cs)
 #endif
 }
-inline int
+static inline int
 write_modem(struct BCState *bcs) {
        int ret=0;
        struct IsdnCardState *cs = bcs->cs;
@@ -275,7 +275,7 @@ write_modem(struct BCState *bcs) {
        return(ret);
 }
-inline void
+static inline void
 modem_fill(struct BCState *bcs) {
                
        if (bcs->tx_skb) {
@@ -422,7 +422,7 @@ extern int open_hscxstate(struct IsdnCardState *cs, struct BCState *bcs);
 extern void modehscx(struct BCState *bcs, int mode, int bc);
 extern void hscx_l2l1(struct PStack *st, int pr, void *arg);
-void
+static void
 close_elsastate(struct BCState *bcs)
 {
        modehscx(bcs, 0, bcs->channel);
@@ -442,7 +442,7 @@ close_elsastate(struct BCState *bcs)
        }
 }
-void
+static void
 modem_write_cmd(struct IsdnCardState *cs, u_char *buf, int len) {
        int count, fp;
        u_char *msg = buf;
@@ -472,7 +472,7 @@ modem_write_cmd(struct IsdnCardState *cs, u_char *buf, int len) {
        }
 }
-void
+static void
 modem_set_init(struct IsdnCardState *cs) {
        int timeout;
@@ -521,7 +521,7 @@ modem_set_init(struct IsdnCardState *cs) {
        udelay(RCV_DELAY);
 }
-void
+static void
 modem_set_dial(struct IsdnCardState *cs, int outgoing) {
        int timeout;
 #define RCV_DELAY 20000 
@@ -543,7 +543,7 @@ modem_set_dial(struct IsdnCardState *cs, int outgoing) {
        udelay(RCV_DELAY);
 }
-void
+static void
 modem_l2l1(struct PStack *st, int pr, void *arg)
 {
        struct BCState *bcs = st->l1.bcs;
@@ -579,7 +579,7 @@ modem_l2l1(struct PStack *st, int pr, void *arg)
        }
 }
-int
+static int
 setstack_elsa(struct PStack *st, struct BCState *bcs)
 {
@@ -614,7 +614,7 @@ setstack_elsa(struct PStack *st, struct BCState *bcs)
        return (0);
 }
-void
+static void
 init_modem(struct IsdnCardState *cs) {
        cs->bcs[0].BC_SetStack = setstack_elsa;
@@ -641,7 +641,7 @@ init_modem(struct IsdnCardState *cs) {
        modem_set_init(cs);
 }
-void
+static void
 release_modem(struct IsdnCardState *cs) {
        cs->hw.elsa.MFlag = 0;
diff --git a/drivers/isdn/hisax/enternow.h b/drivers/isdn/hisax/enternow.h
deleted file mode 100644
index ed2eec5874c5..000000000000
--- a/drivers/isdn/hisax/enternow.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* 2001/10/02
- *
- * enternow.h   Header-file included by
- *              enternow_pci.c
- *
- * Author       Christoph Ersfeld <info@formula-n.de>
- *              Formula-n Europe AG (www.formula-n.com)
- *              previously Gerdes AG
- *
- *
- *              This file is (c) under GNU PUBLIC LICENSE
- */
-/* ***************************************************************************************** *
- * ****************************** datatypes and macros ************************************* *
- * ***************************************************************************************** */
-#define BYTE                                                    unsigned char
-#define WORD                                                    unsigned int
-#define HIBYTE(w)                                               ((unsigned char)((w & 0xff00) / 256))
-#define LOBYTE(w)                                               ((unsigned char)(w & 0x00ff))
-#define InByte(addr)                                            inb(addr)
-#define OutByte(addr,val)                                       outb(val,addr)
-/* ***************************************************************************************** *
- * *********************************** card-specific *************************************** *
- * ***************************************************************************************** */
-/* f�r PowerISDN PCI */
-#define TJ_AMD_IRQ                                              0x20
-#define TJ_LED1                                                 0x40
-#define TJ_LED2                                                 0x80
-/* Das Fenster zum AMD...
- * Ab Adresse hw.njet.base + TJ_AMD_PORT werden vom AMD jeweils 8 Bit in
- * den TigerJet i/o-Raum gemappt
- * -> 0x01 des AMD bei hw.njet.base + 0C4 */
-#define TJ_AMD_PORT                                             0xC0
-/* ***************************************************************************************** *
- * *************************************** Prototypen ************************************** *
- * ***************************************************************************************** */
-BYTE ReadByteAmd7930(struct IsdnCardState *cs, BYTE offset);
-void WriteByteAmd7930(struct IsdnCardState *cs, BYTE offset, BYTE value);
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index 1cc4d11e007a..3341cf155531 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -65,7 +65,6 @@
 #include "isac.h"
 #include "isdnl1.h"
 #include "amd7930_fn.h"
-#include "enternow.h"
 #include <linux/interrupt.h>
 #include <linux/ppp_defs.h>
 #include <linux/pci.h>
@@ -74,58 +73,72 @@
-const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
+static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
+/* f�r PowerISDN PCI */
+#define TJ_AMD_IRQ                                              0x20
+#define TJ_LED1                                                 0x40
+#define TJ_LED2                                                 0x80
+/* Das Fenster zum AMD...
+ * Ab Adresse hw.njet.base + TJ_AMD_PORT werden vom AMD jeweils 8 Bit in
+ * den TigerJet i/o-Raum gemappt
+ * -> 0x01 des AMD bei hw.njet.base + 0C4 */
+#define TJ_AMD_PORT                                             0xC0
 /* *************************** I/O-Interface functions ************************************* */
 /* cs->readisac, macro rByteAMD */
-BYTE
+static unsigned char
-ReadByteAmd7930(struct IsdnCardState *cs, BYTE offset)
+ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
 {
        /* direktes Register */
        if(offset < 8)
-                return (InByte(cs->hw.njet.isac + 4*offset));
+                return (inb(cs->hw.njet.isac + 4*offset));
        /* indirektes Register */
        else {
-                OutByte(cs->hw.njet.isac + 4*AMD_CR, offset);
+                outb(offset, cs->hw.njet.isac + 4*AMD_CR);
-                return(InByte(cs->hw.njet.isac + 4*AMD_DR));
+                return(inb(cs->hw.njet.isac + 4*AMD_DR));
        }
 }
 /* cs->writeisac, macro wByteAMD */
-void
+static void
-WriteByteAmd7930(struct IsdnCardState *cs, BYTE offset, BYTE value)
+WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value)
 {
        /* direktes Register */
        if(offset < 8)
-                OutByte(cs->hw.njet.isac + 4*offset, value);
+                outb(value, cs->hw.njet.isac + 4*offset);
        /* indirektes Register */
        else {
-                OutByte(cs->hw.njet.isac + 4*AMD_CR, offset);
+                outb(offset, cs->hw.njet.isac + 4*AMD_CR);
-                OutByte(cs->hw.njet.isac + 4*AMD_DR, value);
+                outb(value, cs->hw.njet.isac + 4*AMD_DR);
        }
 }
-void
+static void
-enpci_setIrqMask(struct IsdnCardState *cs, BYTE val) {
+enpci_setIrqMask(struct IsdnCardState *cs, unsigned char val) {
        if (!val)
-                OutByte(cs->hw.njet.base+NETJET_IRQMASK1, 0x00);
+                outb(0x00, cs->hw.njet.base+NETJET_IRQMASK1);
        else
-                OutByte(cs->hw.njet.base+NETJET_IRQMASK1, TJ_AMD_IRQ);
+                outb(TJ_AMD_IRQ, cs->hw.njet.base+NETJET_IRQMASK1);
 }
-static BYTE dummyrr(struct IsdnCardState *cs, int chan, BYTE off)
+static unsigned char dummyrr(struct IsdnCardState *cs, int chan, unsigned char off)
 {
        return(5);
 }
-static void dummywr(struct IsdnCardState *cs, int chan, BYTE off, BYTE value)
+static void dummywr(struct IsdnCardState *cs, int chan, unsigned char off, unsigned char value)
 {
 }
@@ -142,18 +155,18 @@ reset_enpci(struct IsdnCardState *cs)
        /* Reset on, (also for AMD) */
        cs->hw.njet.ctrl_reg = 0x07;
-        OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg);
+        outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL);
        mdelay(20);
        /* Reset off */
        cs->hw.njet.ctrl_reg = 0x30;
-        OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg);
+        outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL);
        /* 20ms delay */
        mdelay(20);
        cs->hw.njet.auxd = 0;  // LED-status
        cs->hw.njet.dmactrl = 0;
-        OutByte(cs->hw.njet.base + NETJET_AUXCTRL, ~TJ_AMD_IRQ);
+        outb(~TJ_AMD_IRQ, cs->hw.njet.base + NETJET_AUXCTRL);
-        OutByte(cs->hw.njet.base + NETJET_IRQMASK1, TJ_AMD_IRQ);
+        outb(TJ_AMD_IRQ, cs->hw.njet.base + NETJET_IRQMASK1);
-        OutByte(cs->hw.njet.auxa, cs->hw.njet.auxd); // LED off
+        outb(cs->hw.njet.auxd, cs->hw.njet.auxa); // LED off
 }
@@ -161,7 +174,7 @@ static int
 enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 {
        u_long flags;
-        BYTE *chan;
+        unsigned char *chan;
        if (cs->debug & L1_DEB_ISAC)
                debugl1(cs, "enter:now PCI: card_msg: 0x%04X", mt);
@@ -187,16 +200,16 @@ enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
                case MDL_ASSIGN:
                        /* TEI assigned, LED1 on */
                        cs->hw.njet.auxd = TJ_AMD_IRQ << 1;
-                        OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd);
+                        outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
                        break;
                case MDL_REMOVE:
                        /* TEI removed, LEDs off */
                        cs->hw.njet.auxd = 0;
-                        OutByte(cs->hw.njet.base + NETJET_AUXDATA, 0x00);
+                        outb(0x00, cs->hw.njet.base + NETJET_AUXDATA);
                        break;
                case MDL_BC_ASSIGN:
                        /* activate B-channel */
-                        chan = (BYTE *)arg;
+                        chan = (unsigned char *)arg;
                        if (cs->debug & L1_DEB_ISAC)
                                debugl1(cs, "enter:now PCI: assign phys. BC %d in AMD LMR1", *chan);
@@ -204,11 +217,11 @@ enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
                        cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 | (*chan + 1)), "MDL_BC_ASSIGN");
                        /* at least one b-channel in use, LED 2 on */
                        cs->hw.njet.auxd |= TJ_AMD_IRQ << 2;
-                        OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd);
+                        outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
                        break;
                case MDL_BC_RELEASE:
                        /* deactivate B-channel */
-                        chan = (BYTE *)arg;
+                        chan = (unsigned char *)arg;
                        if (cs->debug & L1_DEB_ISAC)
                                debugl1(cs, "enter:now PCI: release phys. BC %d in Amd LMR1", *chan);
@@ -217,7 +230,7 @@ enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
                        /* no b-channel active -> LED2 off */
                        if (!(cs->dc.amd7930.lmr1 & 3)) {
                                cs->hw.njet.auxd &= ~(TJ_AMD_IRQ << 2);
-                                OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd);
+                                outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
                        }
                        break;
                default:
@@ -231,11 +244,11 @@ static irqreturn_t
 enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
 {
        struct IsdnCardState *cs = dev_id;
-        BYTE s0val, s1val, ir;
+        unsigned char s0val, s1val, ir;
        u_long flags;
        spin_lock_irqsave(&cs->lock, flags);
-        s1val = InByte(cs->hw.njet.base + NETJET_IRQSTAT1);
+        s1val = inb(cs->hw.njet.base + NETJET_IRQSTAT1);
        /* AMD threw an interrupt */
        if (!(s1val & TJ_AMD_IRQ)) {
@@ -245,13 +258,13 @@ enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
                s1val = 1;
        } else
                s1val = 0;
-        s0val = InByte(cs->hw.njet.base + NETJET_IRQSTAT0);
+        s0val = inb(cs->hw.njet.base + NETJET_IRQSTAT0);
        if ((s0val | s1val)==0) { // shared IRQ
                spin_unlock_irqrestore(&cs->lock, flags);
                return IRQ_NONE;
        } 
        if (s0val)
-                OutByte(cs->hw.njet.base + NETJET_IRQSTAT0, s0val);
+                outb(s0val, cs->hw.njet.base + NETJET_IRQSTAT0);
        /* DMA-Interrupt: B-channel-stuff */
        /* set bits in sval to indicate which page is free */
@@ -342,20 +355,20 @@ setup_enternow_pci(struct IsdnCard *card)
                /* Reset an */
                cs->hw.njet.ctrl_reg = 0x07;  // ge�ndert von 0xff
-                OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg);
+                outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL);
                /* 20 ms Pause */
                mdelay(20);
                cs->hw.njet.ctrl_reg = 0x30;  /* Reset Off and status read clear */
-                OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg);
+                outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL);
                mdelay(10);
                cs->hw.njet.auxd = 0x00; // war 0xc0
                cs->hw.njet.dmactrl = 0;
-                OutByte(cs->hw.njet.base + NETJET_AUXCTRL, ~TJ_AMD_IRQ);
+                outb(~TJ_AMD_IRQ, cs->hw.njet.base + NETJET_AUXCTRL);
-                OutByte(cs->hw.njet.base + NETJET_IRQMASK1, TJ_AMD_IRQ);
+                outb(TJ_AMD_IRQ, cs->hw.njet.base + NETJET_IRQMASK1);
-                OutByte(cs->hw.njet.auxa, cs->hw.njet.auxd);
+                outb(cs->hw.njet.auxd, cs->hw.njet.auxa);
                break;
        }
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
index 24a05a43f33e..352b45ac5347 100644
--- a/drivers/isdn/hisax/gazel.c
+++ b/drivers/isdn/hisax/gazel.c
@@ -21,7 +21,7 @@
 #include <linux/pci.h>
 extern const char *CardType[];
-const char *gazel_revision = "$Revision: 2.19.2.4 $";
+static const char *gazel_revision = "$Revision: 2.19.2.4 $";
 #define R647      1
 #define R685      2
@@ -317,7 +317,8 @@ gazel_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
        spin_unlock_irqrestore(&cs->lock, flags);
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_gazel(struct IsdnCardState *cs)
 {
        unsigned int i;
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index ba1d028343ec..6e7e060716b7 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1358,7 +1358,7 @@ chipreset(hfc4s8s_hw * hw)
 /********************************************/
 /* disable/enable hardware in nt or te mode */
 /********************************************/
-void
+static void
 hfc_hardware_enable(hfc4s8s_hw * hw, int enable, int nt_mode)
 {
        u_long flags;
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index ebea3feef003..7cf87793e790 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -345,7 +345,7 @@ hfc_send_data(struct BCState *bcs)
                debugl1(cs,"send_data %d blocked", bcs->channel);
 }
-void
+static void
 main_rec_2bds0(struct BCState *bcs)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -399,7 +399,7 @@ main_rec_2bds0(struct BCState *bcs)
        return;
 }
-void
+static void
 mode_2bs0(struct BCState *bcs, int mode, int bc)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -505,7 +505,7 @@ hfc_l2l1(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 close_2bs0(struct BCState *bcs)
 {
        mode_2bs0(bcs, 0, bcs->channel);
@@ -534,7 +534,7 @@ open_hfcstate(struct IsdnCardState *cs, struct BCState *bcs)
        return (0);
 }
-int
+static int
 setstack_2b(struct PStack *st, struct BCState *bcs)
 {
        bcs->channel = st->l1.bc;
@@ -1004,7 +1004,7 @@ HFCD_l1hw(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 setstack_hfcd(struct PStack *st, struct IsdnCardState *cs)
 {
        st->l1.l1hw = HFCD_l1hw;
@@ -1015,7 +1015,7 @@ hfc_dbusy_timer(struct IsdnCardState *cs)
 {
 }
-unsigned int __init
+static unsigned int __init
 *init_send_hfcd(int cnt)
 {
        int i, *send;
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
index bb376f39ac89..f978a5af8662 100644
--- a/drivers/isdn/hisax/hfc_2bs0.c
+++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -52,7 +52,7 @@ WaitNoBusy(struct IsdnCardState *cs)
                return (to);
 }
-int
+static int
 GetFreeFifoBytes(struct BCState *bcs)
 {
        int s;
@@ -66,7 +66,7 @@ GetFreeFifoBytes(struct BCState *bcs)
        return (s);
 }
-int
+static int
 ReadZReg(struct BCState *bcs, u_char reg)
 {
        int val;
@@ -394,7 +394,7 @@ main_irq_hfc(struct BCState *bcs)
        return;
 }
-void
+static void
 mode_hfc(struct BCState *bcs, int mode, int bc)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -507,7 +507,7 @@ hfc_l2l1(struct PStack *st, int pr, void *arg)
 }
-void
+static void
 close_hfcstate(struct BCState *bcs)
 {
        mode_hfc(bcs, 0, bcs->channel);
@@ -537,7 +537,7 @@ open_hfcstate(struct IsdnCardState *cs, struct BCState *bcs)
        return (0);
 }
-int
+static int
 setstack_hfc(struct PStack *st, struct BCState *bcs)
 {
        bcs->channel = st->l1.bc;
@@ -551,7 +551,7 @@ setstack_hfc(struct PStack *st, struct BCState *bcs)
        return (0);
 }
-void __init
+static void __init
 init_send(struct BCState *bcs)
 {
        int i;
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index c2db52696a86..8337b0f26cc4 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -70,7 +70,7 @@ static const PCI_ENTRY id_list[] =
 /******************************************/
 /* free hardware resources used by driver */
 /******************************************/
-void
+static void
 release_io_hfcpci(struct IsdnCardState *cs)
 {
        printk(KERN_INFO "HiSax: release hfcpci at %p\n",
@@ -394,7 +394,7 @@ receive_dmsg(struct IsdnCardState *cs)
 /*******************************************************************************/
 /* check for transparent receive data and read max one threshold size if avail */
 /*******************************************************************************/
-int
+static int
 hfcpci_empty_fifo_trans(struct BCState *bcs, bzfifo_type * bz, u_char * bdata)
 {
        unsigned short *z1r, *z2r;
@@ -446,7 +446,7 @@ hfcpci_empty_fifo_trans(struct BCState *bcs, bzfifo_type * bz, u_char * bdata)
 /**********************************/
 /* B-channel main receive routine */
 /**********************************/
-void
+static void
 main_rec_hfcpci(struct BCState *bcs)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -1244,7 +1244,7 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg)
 /***********************************************/
 /* called during init setting l1 stack pointer */
 /***********************************************/
-void
+static void
 setstack_hfcpci(struct PStack *st, struct IsdnCardState *cs)
 {
        st->l1.l1hw = HFCPCI_l1hw;
@@ -1268,7 +1268,7 @@ hfcpci_send_data(struct BCState *bcs)
 /***************************************************************/
 /* activate/deactivate hardware for selected channels and mode */
 /***************************************************************/
-void
+static void
 mode_hfcpci(struct BCState *bcs, int mode, int bc)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -1579,7 +1579,7 @@ hfcpci_bh(struct IsdnCardState *cs)
 /********************************/
 /* called for card init message */
 /********************************/
-void __init
+static void __init
 inithfcpci(struct IsdnCardState *cs)
 {
        cs->bcs[0].BC_SetStack = setstack_2b;
diff --git a/drivers/isdn/hisax/hfc_pci.h b/drivers/isdn/hisax/hfc_pci.h
index 4df036ed1af0..9ef2981e404e 100644
--- a/drivers/isdn/hisax/hfc_pci.h
+++ b/drivers/isdn/hisax/hfc_pci.h
@@ -232,5 +232,4 @@ typedef union {
 #define Read_hfc(a,b) (*(((u_char *)a->hw.hfcpci.pci_io)+b))
 extern void main_irq_hcpci(struct BCState *bcs);
-extern void inithfcpci(struct IsdnCardState *cs);
 extern void releasehfcpci(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index a307fcb6c634..f27c1608a3a7 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -308,7 +308,7 @@ read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max)
 /******************************************/
 /* free hardware resources used by driver */
 /******************************************/
-void
+static void
 release_io_hfcsx(struct IsdnCardState *cs)
 {
        cs->hw.hfcsx.int_m2 = 0;        /* interrupt output off ! */
@@ -472,7 +472,7 @@ receive_dmsg(struct IsdnCardState *cs)
 /**********************************/
 /* B-channel main receive routine */
 /**********************************/
-void
+static void
 main_rec_hfcsx(struct BCState *bcs)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -1003,7 +1003,7 @@ HFCSX_l1hw(struct PStack *st, int pr, void *arg)
 /***********************************************/
 /* called during init setting l1 stack pointer */
 /***********************************************/
-void
+static void
 setstack_hfcsx(struct PStack *st, struct IsdnCardState *cs)
 {
        st->l1.l1hw = HFCSX_l1hw;
@@ -1027,7 +1027,7 @@ hfcsx_send_data(struct BCState *bcs)
 /***************************************************************/
 /* activate/deactivate hardware for selected channels and mode */
 /***************************************************************/
-void
+static void
 mode_hfcsx(struct BCState *bcs, int mode, int bc)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -1328,7 +1328,7 @@ hfcsx_bh(struct IsdnCardState *cs)
 /********************************/
 /* called for card init message */
 /********************************/
-void __devinit
+static void __devinit
 inithfcsx(struct IsdnCardState *cs)
 {
        cs->setstack_d = setstack_hfcsx;
diff --git a/drivers/isdn/hisax/hfc_sx.h b/drivers/isdn/hisax/hfc_sx.h
index 12f54159344a..6792f13dc220 100644
--- a/drivers/isdn/hisax/hfc_sx.h
+++ b/drivers/isdn/hisax/hfc_sx.h
@@ -193,5 +193,4 @@ struct hfcsx_extra {
 };
 extern void main_irq_hfcsx(struct BCState *bcs);
-extern void inithfcsx(struct IsdnCardState *cs);
 extern void releasehfcsx(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index ffd74b84f502..e2c3af49d72b 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -60,7 +60,7 @@ static const char *hfcusb_revision =
 #include "hisax_debug.h"
 static u_int debug;
 module_param(debug, uint, 0);
-int hfc_debug;
+static int hfc_debug;
 #endif
@@ -85,7 +85,7 @@ static struct usb_device_id hfc_usb_idtab[] = {
 *   VendorID, ProductID, Devicename, LED_SCHEME,
 *   LED's BitMask in HFCUSB_P_DATA Register : LED_USB, LED_S0, LED_B1, LED_B2
 */
-vendor_data vdata[] = {
+static vendor_data vdata[] = {
        /* CologneChip Eval TA */
        {0x0959, 0x2bd0, "ISDN USB TA (Cologne Chip HFC-S USB based)",
         LED_OFF, {4, 0, 2, 1}
@@ -1137,7 +1137,7 @@ set_hfcmode(hfcusb_data * hfc, int channel, int mode)
        }
 }
-void
+static void
 hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
 {
        usb_fifo *fifo = my_hisax_if->priv;
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index b171600cf641..280dd29b30d6 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -168,7 +168,7 @@ static struct hfcusb_symbolic_list urb_errlist[] = {
 * 3 entries are the configuration number, the minimum interval for
 * Interrupt endpoints & boolean if E-channel logging possible
 */
-int validconf[][19] = {
+static int validconf[][19] = {
        // INT in, ISO out config
        {EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NOP, EP_INT,
         EP_ISO, EP_NUL, EP_ISO, EP_NUL, EP_ISO, EP_NUL, EP_NUL, EP_NUL,
@@ -187,7 +187,7 @@ int validconf[][19] = {
 };
 // string description of chosen config
-char *conf_str[] = {
+static char *conf_str[] = {
        "4 Interrupt IN + 3 Isochron OUT",
        "3 Interrupt IN + 3 Isochron OUT",
        "4 Isochron IN + 3 Isochron OUT",
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 6fc55fea1702..86ab1c13f6b1 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -52,7 +52,7 @@ hfcs_Timer(struct IsdnCardState *cs)
 */
 }
-void
+static void
 release_io_hfcs(struct IsdnCardState *cs)
 {
        release2bds0(cs);
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index dc5791728d53..17cf7663c582 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -1271,7 +1271,6 @@ extern void Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf,
 void init_bcstate(struct IsdnCardState *cs, int bc);
 void setstack_HiSax(struct PStack *st, struct IsdnCardState *cs);
-unsigned int random_ri(void);
 void HiSax_addlist(struct IsdnCardState *sp, struct PStack *st);
 void HiSax_rmlist(struct IsdnCardState *sp, struct PStack *st);
@@ -1315,15 +1314,11 @@ int QuickHex(char *txt, u_char * p, int cnt);
 void LogFrame(struct IsdnCardState *cs, u_char * p, int size);
 void dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir);
 void iecpy(u_char * dest, u_char * iestart, int ieoffset);
-#ifdef ISDN_CHIP_ISAC
-void setstack_isac(struct PStack *st, struct IsdnCardState *cs);
-#endif  /* ISDN_CHIP_ISAC */
 #endif  /* __KERNEL__ */
 #define HZDELAY(jiffs) {int tout = jiffs; while (tout--) udelay(1000000/HZ);}
 int ll_run(struct IsdnCardState *cs, int addfeatures);
-void ll_stop(struct IsdnCardState *cs);
 int CallcNew(void);
 void CallcFree(void);
 int CallcNewChan(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c
index 5bbbe3e95125..66dbaee77bfb 100644
--- a/drivers/isdn/hisax/hscx.c
+++ b/drivers/isdn/hisax/hscx.c
@@ -151,7 +151,7 @@ hscx_l2l1(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 close_hscxstate(struct BCState *bcs)
 {
        modehscx(bcs, 0, bcs->channel);
@@ -203,7 +203,7 @@ open_hscxstate(struct IsdnCardState *cs, struct BCState *bcs)
        return (0);
 }
-int
+static int
 setstack_hscx(struct PStack *st, struct BCState *bcs)
 {
        bcs->channel = st->l1.bc;
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
index dcf31f83c600..b4ca5859b177 100644
--- a/drivers/isdn/hisax/icc.c
+++ b/drivers/isdn/hisax/icc.c
@@ -108,7 +108,7 @@ icc_bh(struct IsdnCardState *cs)
 #endif
 }
-void
+static void
 icc_empty_fifo(struct IsdnCardState *cs, int count)
 {
        u_char *ptr;
@@ -563,13 +563,13 @@ ICC_l1hw(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 setstack_icc(struct PStack *st, struct IsdnCardState *cs)
 {
        st->l1.l1hw = ICC_l1hw;
 }
-void 
+static void
 DC_Close_icc(struct IsdnCardState *cs) {
        if (cs->dc.icc.mon_rx) {
                kfree(cs->dc.icc.mon_rx);
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index 6485e232d869..efba2f448017 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -36,8 +36,6 @@ static void ph_command(struct IsdnCardState *cs, unsigned int command);
 static inline void cic_int(struct IsdnCardState *cs);
 static void dch_l2l1(struct PStack *st, int pr, void *arg);
 static void dbusy_timer_handler(struct IsdnCardState *cs);
-static void ipacx_new_ph(struct IsdnCardState *cs);
-static void dch_bh(struct IsdnCardState *cs);
 static void dch_empty_fifo(struct IsdnCardState *cs, int count);
 static void dch_fill_fifo(struct IsdnCardState *cs);
 static inline void dch_int(struct IsdnCardState *cs);
@@ -232,81 +230,6 @@ dbusy_timer_handler(struct IsdnCardState *cs)
 }
 //----------------------------------------------------------
-// L1 state machine intermediate layer to isdnl1 module
-//----------------------------------------------------------
-static void
-ipacx_new_ph(struct IsdnCardState *cs)
-{
-        switch (cs->dc.isac.ph_state) {
-                case (IPACX_IND_RES):
-                        ph_command(cs, IPACX_CMD_DI);
-                        l1_msg(cs, HW_RESET | INDICATION, NULL);
-                        break;
-      
-                case (IPACX_IND_DC):
-                        l1_msg(cs, HW_DEACTIVATE | CONFIRM, NULL);
-                        break;
-      
-                case (IPACX_IND_DR):
-                        l1_msg(cs, HW_DEACTIVATE | INDICATION, NULL);
-                        break;
-      
-                case (IPACX_IND_PU):
-                        l1_msg(cs, HW_POWERUP | CONFIRM, NULL);
-                        break;
-                case (IPACX_IND_RSY):
-                        l1_msg(cs, HW_RSYNC | INDICATION, NULL);
-                        break;
-                case (IPACX_IND_AR):
-                        l1_msg(cs, HW_INFO2 | INDICATION, NULL);
-                        break;
-      
-                case (IPACX_IND_AI8):
-                        l1_msg(cs, HW_INFO4_P8 | INDICATION, NULL);
-                        break;
-      
-                case (IPACX_IND_AI10):
-                        l1_msg(cs, HW_INFO4_P10 | INDICATION, NULL);
-                        break;
-      
-                default:
-                        break;
-        }
-}
-//----------------------------------------------------------
-// bottom half handler for D channel
-//----------------------------------------------------------
-static void
-dch_bh(struct IsdnCardState *cs)
-{
-        struct PStack *st;
-        
-        if (!cs) return;
-  
-        if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) {
-                if (cs->debug) debugl1(cs, "D-Channel Busy cleared");
-                for (st = cs->stlist; st; st = st->next) {
-                        st->l1.l1l2(st, PH_PAUSE | CONFIRM, NULL);
-                }
-        }
-  
-        if (test_and_clear_bit(D_RCVBUFREADY, &cs->event)) {
-                DChannel_proc_rcv(cs);
-  }  
-  
-        if (test_and_clear_bit(D_XMTBUFREADY, &cs->event)) {
-                DChannel_proc_xmt(cs);
-  }  
-  
-        if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) {
-    ipacx_new_ph(cs);
-  }  
-}
-//----------------------------------------------------------
 // Fill buffer from receive FIFO
 //----------------------------------------------------------
 static void 
@@ -991,14 +914,5 @@ init_ipacx(struct IsdnCardState *cs, int part)
        }
 }
-void __devinit
-setup_ipacx(struct IsdnCardState *cs)
-{
-        INIT_WORK(&cs->tqueue, (void *)(void *) dch_bh, cs);
-        cs->dbusytimer.function = (void *) dbusy_timer_handler;
-        cs->dbusytimer.data = (long) cs;
-        init_timer(&cs->dbusytimer);
-}
 //----------------- end of file -----------------------
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 20b949952952..85e063a08d23 100644
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -112,7 +112,7 @@ isac_bh(struct IsdnCardState *cs)
 #endif
 }
-void
+static void
 isac_empty_fifo(struct IsdnCardState *cs, int count)
 {
        u_char *ptr;
@@ -563,13 +563,13 @@ ISAC_l1hw(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 setstack_isac(struct PStack *st, struct IsdnCardState *cs)
 {
        st->l1.l1hw = ISAC_l1hw;
 }
-void 
+static void
 DC_Close_isac(struct IsdnCardState *cs) {
        if (cs->dc.isac.mon_rx) {
                kfree(cs->dc.isac.mon_rx);
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index ee081321efb2..642a87c51295 100644
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -21,13 +21,13 @@
 #define ETX     0x03
 #define FAXMODCNT       13
-const   u_char  faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146};
+static const    u_char  faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146};
 static  u_int   modmask = 0x1fff;
 static  int     frm_extra_delay = 2;
 static  int     para_TOA = 6;
-const   u_char  *FC1_CMD[] = {"FAE", "FTS", "FRS", "FTM", "FRM", "FTH", "FRH", "CTRL" };
+static const   u_char  *FC1_CMD[] = {"FAE", "FTS", "FRS", "FTM", "FRM", "FTH", "FRH", "CTRL" };
-void isar_setup(struct IsdnCardState *cs);
+static void isar_setup(struct IsdnCardState *cs);
 static void isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para);
 static void ll_deliver_faxstat(struct BCState *bcs, u_char status);
@@ -45,7 +45,7 @@ waitforHIA(struct IsdnCardState *cs, int timeout)
 }
-int
+static int
 sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len,
        u_char *msg)
 {
@@ -85,7 +85,7 @@ sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len,
 }
 /* Call only with IRQ disabled !!! */
-inline void
+static inline void
 rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u_char *msg)
 {
        int i;
@@ -114,7 +114,7 @@ rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u_char *msg)
 }
 /* Call only with IRQ disabled !!! */
-inline void
+static inline void
 get_irq_infos(struct IsdnCardState *cs, struct isar_reg *ireg)
 {
        ireg->iis = cs->BC_Read_Reg(cs, 1, ISAR_IIS);
@@ -127,7 +127,7 @@ get_irq_infos(struct IsdnCardState *cs, struct isar_reg *ireg)
 #endif
 }
-int
+static int
 waitrecmsg(struct IsdnCardState *cs, u_char *len,
        u_char *msg, int maxdelay)
 {
@@ -185,7 +185,7 @@ ISARVersion(struct IsdnCardState *cs, char *s)
        return(ver);
 }
-int
+static int
 isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf)
 {
        int ret, size, cnt, debug;
@@ -739,7 +739,7 @@ isar_fill_fifo(struct BCState *bcs)
        }
 }
-inline
+static inline
 struct BCState *sel_bcs_isar(struct IsdnCardState *cs, u_char dpath)
 {
        if ((!dpath) || (dpath == 3))
@@ -751,7 +751,7 @@ struct BCState *sel_bcs_isar(struct IsdnCardState *cs, u_char dpath)
        return(NULL);
 }
-void
+static void
 send_frames(struct BCState *bcs)
 {
        if (bcs->tx_skb) {
@@ -806,7 +806,7 @@ send_frames(struct BCState *bcs)
        }
 }
-inline void
+static inline void
 check_send(struct IsdnCardState *cs, u_char rdm)
 {
        struct BCState *bcs;
@@ -828,11 +828,13 @@ check_send(struct IsdnCardState *cs, u_char rdm)
        
 }
-const char *dmril[] = {"NO SPEED", "1200/75", "NODEF2", "75/1200", "NODEF4",
+static const char *dmril[] = {"NO SPEED", "1200/75", "NODEF2", "75/1200",
-                        "300", "600", "1200", "2400", "4800", "7200",
+                                "NODEF4", "300", "600", "1200", "2400",
-                        "9600nt", "9600t", "12000", "14400", "WRONG"};
+                                "4800", "7200", "9600nt", "9600t", "12000",
-const char *dmrim[] = {"NO MOD", "NO DEF", "V32/V32b", "V22", "V21",
+                                "14400", "WRONG"};
-                        "Bell103", "V23", "Bell202", "V17", "V29", "V27ter"};
+static const char *dmrim[] = {"NO MOD", "NO DEF", "V32/V32b", "V22", "V21",
+                                "Bell103", "V23", "Bell202", "V17", "V29",
+                                "V27ter"};
 static void
 isar_pump_status_rsp(struct BCState *bcs, struct isar_reg *ireg) {
@@ -1388,7 +1390,7 @@ setup_iom2(struct BCState *bcs) {
        udelay(1000);
 }
-int
+static int
 modeisar(struct BCState *bcs, int mode, int bc)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -1562,7 +1564,7 @@ isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para)
                sendmsg(cs, dps | ISAR_HIS_PUMPCTRL, ctrl, nom, &p1);
 }
-void
+static void
 isar_setup(struct IsdnCardState *cs)
 {
        u_char msg;
@@ -1582,7 +1584,7 @@ isar_setup(struct IsdnCardState *cs)
        }
 }
-void
+static void
 isar_l2l1(struct PStack *st, int pr, void *arg)
 {
        struct BCState *bcs = st->l1.bcs;
@@ -1681,7 +1683,7 @@ isar_l2l1(struct PStack *st, int pr, void *arg)
        }
 }
-void
+static void
 close_isarstate(struct BCState *bcs)
 {
        modeisar(bcs, 0, bcs->channel);
@@ -1703,7 +1705,7 @@ close_isarstate(struct BCState *bcs)
        del_timer(&bcs->hw.isar.ftimer);
 }
-int
+static int
 open_isarstate(struct IsdnCardState *cs, struct BCState *bcs)
 {
        if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) {
@@ -1725,7 +1727,7 @@ open_isarstate(struct IsdnCardState *cs, struct BCState *bcs)
        return (0);
 }
-int
+static int
 setstack_isar(struct PStack *st, struct BCState *bcs)
 {
        bcs->channel = st->l1.bc;
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
index 4d08d27f1499..ac899503a74f 100644
--- a/drivers/isdn/hisax/isdnl1.c
+++ b/drivers/isdn/hisax/isdnl1.c
@@ -151,7 +151,7 @@ l1m_debug(struct FsmInst *fi, char *fmt, ...)
        va_end(args);
 }
-void
+static void
 L1activated(struct IsdnCardState *cs)
 {
        struct PStack *st;
@@ -166,7 +166,7 @@ L1activated(struct IsdnCardState *cs)
        }
 }
-void
+static void
 L1deactivated(struct IsdnCardState *cs)
 {
        struct PStack *st;
@@ -370,7 +370,7 @@ init_bcstate(struct IsdnCardState *cs, int bc)
 #ifdef L2FRAME_DEBUG            /* psa */
-char *
+static char *
 l2cmd(u_char cmd)
 {
        switch (cmd & ~0x10) {
@@ -404,7 +404,7 @@ l2cmd(u_char cmd)
 static char tmpdeb[32];
-char *
+static char *
 l2frames(u_char * ptr)
 {
        switch (ptr[2] & ~0x10) {
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index d311b5fbf895..9022583fd6a0 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -142,7 +142,7 @@ freewin1(struct Layer2 *l2)
        return cnt;
 }
-inline void
+static inline void
 freewin(struct PStack *st)
 {
        freewin1(&st->l2);
@@ -157,7 +157,7 @@ ReleaseWin(struct Layer2 *l2)
                printk(KERN_WARNING "isdl2 freed %d skbuffs in release\n", cnt);
 }
-inline unsigned int
+static inline unsigned int
 cansend(struct PStack *st)
 {
        unsigned int p1;
@@ -169,7 +169,7 @@ cansend(struct PStack *st)
        return ((p1 < st->l2.window) && !test_bit(FLG_PEER_BUSY, &st->l2.flag));
 }
-inline void
+static inline void
 clear_exception(struct Layer2 *l2)
 {
        test_and_clear_bit(FLG_ACK_PEND, &l2->flag);
@@ -178,7 +178,7 @@ clear_exception(struct Layer2 *l2)
        clear_peer_busy(l2);
 }
-inline int
+static inline int
 l2headersize(struct Layer2 *l2, int ui)
 {
        return (((test_bit(FLG_MOD128, &l2->flag) && (!ui)) ? 2 : 1) +
@@ -223,40 +223,31 @@ enqueue_super(struct PStack *st,
 #define enqueue_ui(a, b) enqueue_super(a, b)
-inline int
+static inline int
 IsUI(u_char * data)
 {
        return ((data[0] & 0xef) == UI);
 }
-inline int
+static inline int
 IsUA(u_char * data)
 {
        return ((data[0] & 0xef) == UA);
 }
-inline int
+static inline int
 IsDM(u_char * data)
 {
        return ((data[0] & 0xef) == DM);
 }
-inline int
+static inline int
 IsDISC(u_char * data)
 {
        return ((data[0] & 0xef) == DISC);
 }
-inline int
+static inline int
-IsRR(u_char * data, struct PStack *st)
-{
-        if (test_bit(FLG_MOD128, &st->l2.flag))
-                return (data[0] == RR);
-        else
-                return ((data[0] & 0xf) == 1);
-}
-inline int
 IsSFrame(u_char * data, struct PStack *st)
 {
        register u_char d = *data;
@@ -266,7 +257,7 @@ IsSFrame(u_char * data, struct PStack *st)
        return(((d & 0xf3) == 1) && ((d & 0x0c) != 0x0c));
 }
-inline int
+static inline int
 IsSABME(u_char * data, struct PStack *st)
 {
        u_char d = data[0] & ~0x10;
@@ -274,25 +265,25 @@ IsSABME(u_char * data, struct PStack *st)
        return (test_bit(FLG_MOD128, &st->l2.flag) ? d == SABME : d == SABM);
 }
-inline int
+static inline int
 IsREJ(u_char * data, struct PStack *st)
 {
        return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == REJ : (data[0] & 0xf) == REJ);
 }
-inline int
+static inline int
 IsFRMR(u_char * data)
 {
        return ((data[0] & 0xef) == FRMR);
 }
-inline int
+static inline int
 IsRNR(u_char * data, struct PStack *st)
 {
        return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == RNR : (data[0] & 0xf) == RNR);
 }
-int
+static int
 iframe_error(struct PStack *st, struct sk_buff *skb)
 {
        int i = l2addrsize(&st->l2) + (test_bit(FLG_MOD128, &st->l2.flag) ? 2 : 1);
@@ -315,7 +306,7 @@ iframe_error(struct PStack *st, struct sk_buff *skb)
        return 0;
 }
-int
+static int
 super_error(struct PStack *st, struct sk_buff *skb)
 {
        if (skb->len != l2addrsize(&st->l2) +
@@ -325,7 +316,7 @@ super_error(struct PStack *st, struct sk_buff *skb)
        return 0;
 }
-int
+static int
 unnum_error(struct PStack *st, struct sk_buff *skb, int wantrsp)
 {
        int rsp = (*skb->data & 0x2) >> 1;
@@ -341,7 +332,7 @@ unnum_error(struct PStack *st, struct sk_buff *skb, int wantrsp)
        return 0;
 }
-int
+static int
 UI_error(struct PStack *st, struct sk_buff *skb)
 {
        int rsp = *skb->data & 0x2;
@@ -357,7 +348,7 @@ UI_error(struct PStack *st, struct sk_buff *skb)
        return 0;
 }
-int
+static int
 FRMR_error(struct PStack *st, struct sk_buff *skb)
 {
        int headers = l2addrsize(&st->l2) + 1;
@@ -444,51 +435,44 @@ send_uframe(struct PStack *st, u_char cmd, u_char cr)
        enqueue_super(st, skb);
 }
-inline u_char
+static inline u_char
 get_PollFlag(struct PStack * st, struct sk_buff * skb)
 {
        return (skb->data[l2addrsize(&(st->l2))] & 0x10);
 }
-inline void
+static inline u_char
-FreeSkb(struct sk_buff *skb)
-{
-        dev_kfree_skb(skb);
-}
-inline u_char
 get_PollFlagFree(struct PStack *st, struct sk_buff *skb)
 {
        u_char PF;
        PF = get_PollFlag(st, skb);
-        FreeSkb(skb);
+        dev_kfree_skb(skb);
        return (PF);
 }
-inline void
+static inline void
 start_t200(struct PStack *st, int i)
 {
        FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, i);
        test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
 }
-inline void
+static inline void
 restart_t200(struct PStack *st, int i)
 {
        FsmRestartTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, i);
        test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
 }
-inline void
+static inline void
 stop_t200(struct PStack *st, int i)
 {
        if(test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
                FsmDelTimer(&st->l2.t200, i);
 }
-inline void
+static inline void
 st5_dl_release_l2l3(struct PStack *st)
 {
                int pr;
@@ -501,7 +485,7 @@ st5_dl_release_l2l3(struct PStack *st)
                st->l2.l2l3(st, pr, NULL);
 }
-inline void
+static inline void
 lapb_dl_release_l2l3(struct PStack *st, int f)
 {
                if (test_bit(FLG_LAPB, &st->l2.flag))
@@ -802,7 +786,7 @@ l2_connected(struct FsmInst *fi, int event, void *arg)
                l2_mdl_error_ua(fi, event, arg);
                return;
        }
-        FreeSkb(skb);
+        dev_kfree_skb(skb);
        if (test_and_clear_bit(FLG_PEND_REL, &st->l2.flag))
                l2_disconnect(fi, event, arg);
@@ -840,7 +824,7 @@ l2_released(struct FsmInst *fi, int event, void *arg)
                l2_mdl_error_ua(fi, event, arg);
                return;
        }
-        FreeSkb(skb);
+        dev_kfree_skb(skb);
        stop_t200(st, 6);
        lapb_dl_release_l2l3(st, CONFIRM);
@@ -889,7 +873,7 @@ l2_st6_dm_release(struct FsmInst *fi, int event, void *arg)
        }
 }
-inline void
+static inline void
 enquiry_cr(struct PStack *st, u_char typ, u_char cr, u_char pf)
 {
        struct sk_buff *skb;
@@ -912,7 +896,7 @@ enquiry_cr(struct PStack *st, u_char typ, u_char cr, u_char pf)
        enqueue_super(st, skb);
 }
-inline void
+static inline void
 enquiry_response(struct PStack *st)
 {
        if (test_bit(FLG_OWN_BUSY, &st->l2.flag))
@@ -922,7 +906,7 @@ enquiry_response(struct PStack *st)
        test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
 }
-inline void
+static inline void
 transmit_enquiry(struct PStack *st)
 {
        if (test_bit(FLG_OWN_BUSY, &st->l2.flag))
@@ -1004,7 +988,7 @@ l2_st7_got_super(struct FsmInst *fi, int event, void *arg)
                PollFlag = (skb->data[0] & 0x10);
                nr = (skb->data[0] >> 5) & 0x7;
        }
-        FreeSkb(skb);
+        dev_kfree_skb(skb);
        if (PollFlag) {
                if (rsp)
@@ -1047,7 +1031,7 @@ l2_feed_i_if_reest(struct FsmInst *fi, int event, void *arg)
        if (!test_bit(FLG_L3_INIT, &st->l2.flag))
                skb_queue_tail(&st->l2.i_queue, skb);
        else
-                FreeSkb(skb);
+                dev_kfree_skb(skb);
 }
 static void
@@ -1093,7 +1077,7 @@ l2_got_iframe(struct FsmInst *fi, int event, void *arg)
                nr = (skb->data[i] >> 5) & 0x7;
        }
        if (test_bit(FLG_OWN_BUSY, &l2->flag)) {
-                FreeSkb(skb);
+                dev_kfree_skb(skb);
                if(PollFlag) enquiry_response(st);
        } else if (l2->vr == ns) {
                (l2->vr)++;
@@ -1111,7 +1095,7 @@ l2_got_iframe(struct FsmInst *fi, int event, void *arg)
                st->l2.l2l3(st, DL_DATA | INDICATION, skb);
        } else {
                /* n(s)!=v(r) */
-                FreeSkb(skb);
+                dev_kfree_skb(skb);
                if (test_and_set_bit(FLG_REJEXC, &l2->flag)) {
                        if (PollFlag)
                                enquiry_response(st);
@@ -1309,7 +1293,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                skb = alloc_skb(oskb->len + i, GFP_ATOMIC);
                memcpy(skb_put(skb, i), header, i);
                memcpy(skb_put(skb, oskb->len), oskb->data, oskb->len);
-                FreeSkb(oskb);
+                dev_kfree_skb(oskb);
        }
        st->l2.l2l1(st, PH_PULL | INDICATION, skb);
        test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
@@ -1349,7 +1333,7 @@ l2_st8_got_super(struct FsmInst *fi, int event, void *arg)
                PollFlag = (skb->data[0] & 0x10);
                nr = (skb->data[0] >> 5) & 0x7;
        }
-        FreeSkb(skb);
+        dev_kfree_skb(skb);
        if (rsp && PollFlag) {
                if (legalnr(st, nr)) {
@@ -1391,7 +1375,7 @@ l2_got_FRMR(struct FsmInst *fi, int event, void *arg)
                establishlink(fi);
                test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
        }
-        FreeSkb(skb);
+        dev_kfree_skb(skb);
 }
 static void
@@ -1655,7 +1639,7 @@ isdnl2_l1l2(struct PStack *st, int pr, void *arg)
                                datap += len;
                        else {
                                FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'N');
-                                FreeSkb(skb);
+                                dev_kfree_skb(skb);
                                return;
                        }
                        if (!(*datap & 1)) {    /* I-Frame */
@@ -1684,16 +1668,16 @@ isdnl2_l1l2(struct PStack *st, int pr, void *arg)
                                        ret = FsmEvent(&st->l2.l2m, EV_L2_FRMR, skb);
                        } else {
                                FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'L');
-                                FreeSkb(skb);
+                                dev_kfree_skb(skb);
                                ret = 0;
                        }
                        if(c) {
-                                FreeSkb(skb);
+                                dev_kfree_skb(skb);
                                FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *)(long)c);
                                ret = 0;
                        }
                        if (ret)
-                                FreeSkb(skb);
+                                dev_kfree_skb(skb);
                        break;
                case (PH_PULL | CONFIRM):
                        FsmEvent(&st->l2.l2m, EV_L2_ACK_PULL, arg);
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
index f571b5d18e91..abcc9530eb34 100644
--- a/drivers/isdn/hisax/isdnl3.c
+++ b/drivers/isdn/hisax/isdnl3.c
@@ -390,7 +390,7 @@ setstack_l3dc(struct PStack *st, struct Channel *chanp)
        }
 }
-void
+static void
 isdnl3_trans(struct PStack *st, int pr, void *arg) {
        st->l3.l3l2(st, pr, arg);
 }
diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
index af5171da7345..33747afc984d 100644
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -122,7 +122,7 @@ isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_isurf(struct IsdnCardState *cs)
 {
        release_region(cs->hw.isurf.reset, 1);
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index b843b7509ae2..908a7e144421 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -25,7 +25,7 @@
 #include "isdnl1.h"
 extern const char *CardType[];
-const char *ix1_revision = "$Revision: 2.12.2.4 $";
+static const char *ix1_revision = "$Revision: 2.12.2.4 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -162,7 +162,7 @@ ix1micro_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_ix1micro(struct IsdnCardState *cs)
 {
        if (cs->hw.ix1.cfg_reg)
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index f05d52757557..363ae3179bbd 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -74,7 +74,7 @@ jade_write_indirect(struct IsdnCardState *cs, u_char reg, u_char value)
-void
+static void
 modejade(struct BCState *bcs, int mode, int bc)
 {
    struct IsdnCardState *cs = bcs->cs;
@@ -190,7 +190,7 @@ jade_l2l1(struct PStack *st, int pr, void *arg)
    }
 }
-void
+static void
 close_jadestate(struct BCState *bcs)
 {
    modejade(bcs, 0, bcs->channel);
@@ -243,7 +243,7 @@ open_jadestate(struct IsdnCardState *cs, struct BCState *bcs)
 }
-int
+static int
 setstack_jade(struct PStack *st, struct BCState *bcs)
 {
        bcs->channel = st->l1.bc;
diff --git a/drivers/isdn/hisax/jade.h b/drivers/isdn/hisax/jade.h
index fa2944485994..29055e1ee381 100644
--- a/drivers/isdn/hisax/jade.h
+++ b/drivers/isdn/hisax/jade.h
@@ -128,7 +128,6 @@
 #define jade_TXAUDIOCH2CFG                              0x1A
 extern int JadeVersion(struct IsdnCardState *cs, char *s);
-extern void modejade(struct BCState *bcs, int mode, int bc);
 extern void clear_pending_jade_ints(struct IsdnCardState *cs);
 extern void initjade(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c
index d6c1c8f8329d..c5c36eeff261 100644
--- a/drivers/isdn/hisax/l3_1tr6.c
+++ b/drivers/isdn/hisax/l3_1tr6.c
@@ -19,7 +19,7 @@
 #include <linux/ctype.h>
 extern char *HiSax_getrev(const char *revision);
-const char *l3_1tr6_revision = "$Revision: 2.15.2.3 $";
+static const char *l3_1tr6_revision = "$Revision: 2.15.2.3 $";
 #define MsgHead(ptr, cref, mty, dis) \
        *ptr++ = dis; \
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c
index ec92308c1efc..a6d2abdb478a 100644
--- a/drivers/isdn/hisax/l3dss1.c
+++ b/drivers/isdn/hisax/l3dss1.c
@@ -26,7 +26,7 @@
 #include <linux/config.h>
 extern char *HiSax_getrev(const char *revision);
-const char *dss1_revision = "$Revision: 2.32.2.3 $";
+static const char *dss1_revision = "$Revision: 2.32.2.3 $";
 #define EXT_BEARER_CAPS 1
diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c
index 3ab3a54daac1..f7041d5ba64e 100644
--- a/drivers/isdn/hisax/l3ni1.c
+++ b/drivers/isdn/hisax/l3ni1.c
@@ -24,7 +24,7 @@
 #include <linux/ctype.h>
 extern char *HiSax_getrev(const char *revision);
-const char *ni1_revision = "$Revision: 2.8.2.3 $";
+static const char *ni1_revision = "$Revision: 2.8.2.3 $";
 #define EXT_BEARER_CAPS 1
@@ -2665,7 +2665,7 @@ static void l3ni1_spid_send( struct l3_process *pc, u_char pr, void *arg )
        l3ni1_SendSpid( pc, pr, arg, 20 );
 }
-void l3ni1_spid_epid( struct l3_process *pc, u_char pr, void *arg )
+static void l3ni1_spid_epid( struct l3_process *pc, u_char pr, void *arg )
 {
        struct sk_buff *skb = arg;
diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
index 3ac4484a4886..fe11f226b285 100644
--- a/drivers/isdn/hisax/mic.c
+++ b/drivers/isdn/hisax/mic.c
@@ -18,7 +18,7 @@
 extern const char *CardType[];
-const char *mic_revision = "$Revision: 1.12.2.4 $";
+static const char *mic_revision = "$Revision: 1.12.2.4 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -157,7 +157,7 @@ mic_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_mic(struct IsdnCardState *cs)
 {
        int bytecnt = 8;
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index fe61d26365d3..94da03c30c51 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -25,8 +25,6 @@
 #include <asm/io.h>
 #include "netjet.h"
-const char *NETjet_revision = "$Revision: 1.29.2.4 $";
 /* Interface functions */
 u_char
@@ -66,7 +64,7 @@ NETjet_WriteICfifo(struct IsdnCardState *cs, u_char *data, int size)
        outsb(cs->hw.njet.isac, data, size);
 }
-void fill_mem(struct BCState *bcs, u_int *pos, u_int cnt, int chan, u_char fill)
+static void fill_mem(struct BCState *bcs, u_int *pos, u_int cnt, int chan, u_char fill)
 {
        u_int mask=0x000000ff, val = 0, *p=pos;
        u_int i;
@@ -85,7 +83,7 @@ void fill_mem(struct BCState *bcs, u_int *pos, u_int cnt, int chan, u_char fill)
        }
 }
-void
+static void
 mode_tiger(struct BCState *bcs, int mode, int bc)
 {
        struct IsdnCardState *cs = bcs->cs;
@@ -852,7 +850,7 @@ tiger_l2l1(struct PStack *st, int pr, void *arg)
 }
-void
+static void
 close_tigerstate(struct BCState *bcs)
 {
        mode_tiger(bcs, 0, bcs->channel);
@@ -900,7 +898,7 @@ open_tigerstate(struct IsdnCardState *cs, struct BCState *bcs)
        return (0);
 }
-int
+static int
 setstack_tiger(struct PStack *st, struct BCState *bcs)
 {
        bcs->channel = st->l1.bc;
@@ -966,7 +964,7 @@ inittiger(struct IsdnCardState *cs)
        cs->bcs[1].BC_Close = close_tigerstate;
 }
-void
+static void
 releasetiger(struct IsdnCardState *cs)
 {
        if (cs->bcs[0].hw.tiger.send) {
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index cf77d8360975..68a2159cbd11 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -24,7 +24,7 @@
 #include <linux/isapnp.h>
 extern const char *CardType[];
-const char *niccy_revision = "$Revision: 1.21.2.4 $";
+static const char *niccy_revision = "$Revision: 1.21.2.4 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -178,7 +178,7 @@ niccy_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_niccy(struct IsdnCardState *cs)
 {
        if (cs->subtyp == NICCY_PCI) {
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index fd664697f821..a7d3cd3f36fd 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -15,7 +15,7 @@
 #include <linux/ppp_defs.h>
 #include "netjet.h"
-const char *NETjet_S_revision = "$Revision: 2.13.2.4 $";
+static const char *NETjet_S_revision = "$Revision: 2.13.2.4 $";
 static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
 {
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c
index 3d6441e9633c..1ae7cac98a87 100644
--- a/drivers/isdn/hisax/nj_u.c
+++ b/drivers/isdn/hisax/nj_u.c
@@ -15,7 +15,7 @@
 #include <linux/ppp_defs.h>
 #include "netjet.h"
-const char *NETjet_U_revision = "$Revision: 2.14.2.3 $";
+static const char *NETjet_U_revision = "$Revision: 2.14.2.3 $";
 static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
 {
diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c
index 170fcd4a3984..abecabf8c271 100644
--- a/drivers/isdn/hisax/q931.c
+++ b/drivers/isdn/hisax/q931.c
@@ -516,7 +516,7 @@ struct MessageType cause_1tr6[] =
        {CAUSE_UserInfoDiscarded, "User Info Discarded"}
 };
-int cause_1tr6_len = (sizeof(cause_1tr6) / sizeof(struct MessageType));
+static int cause_1tr6_len = (sizeof(cause_1tr6) / sizeof(struct MessageType));
 static int
 prcause_1tr6(char *dest, u_char * p)
@@ -935,7 +935,7 @@ display(char *dest, u_char * p)
        return (dp - dest);
 }
-int
+static int
 prfacility(char *dest, u_char * p)
 {
        char *dp = dest;
diff --git a/drivers/isdn/hisax/s0box.c b/drivers/isdn/hisax/s0box.c
index f3c481384a4e..7b63085ea6e5 100644
--- a/drivers/isdn/hisax/s0box.c
+++ b/drivers/isdn/hisax/s0box.c
@@ -17,7 +17,7 @@
 #include "isdnl1.h"
 extern const char *CardType[];
-const char *s0box_revision = "$Revision: 2.6.2.4 $";
+static const char *s0box_revision = "$Revision: 2.6.2.4 $";
 static inline void
 writereg(unsigned int padr, signed int addr, u_char off, u_char val) {
@@ -183,7 +183,7 @@ s0box_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_s0box(struct IsdnCardState *cs)
 {
        release_region(cs->hw.teles3.cfg_reg, 8);
diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
index 9e6d3d686cce..821776e1561a 100644
--- a/drivers/isdn/hisax/saphir.c
+++ b/drivers/isdn/hisax/saphir.c
@@ -171,7 +171,7 @@ SaphirWatchDog(struct IsdnCardState *cs)
        mod_timer(&cs->hw.saphir.timer, jiffies+1*HZ);
 }
-void
+static void
 release_io_saphir(struct IsdnCardState *cs)
 {
        byteout(cs->hw.saphir.cfg_reg + IRQ_REG, 0xff);
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 8390f1606853..8c044a6a7fe3 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -51,9 +51,9 @@
 extern const char *CardType[];
-const char *Sedlbauer_revision = "$Revision: 1.34.2.6 $";
+static const char *Sedlbauer_revision = "$Revision: 1.34.2.6 $";
-const char *Sedlbauer_Types[] =
+static const char *Sedlbauer_Types[] =
        {"None", "speed card/win", "speed star", "speed fax+",
        "speed win II / ISDN PC/104", "speed star II", "speed pci",
        "speed fax+ pyramid", "speed fax+ pci", "HST Saphir III"};
@@ -394,7 +394,7 @@ sedlbauer_interrupt_isar(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_sedlbauer(struct IsdnCardState *cs)
 {
        int bytecnt = 8;
diff --git a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c
index 132840b750ce..cdf35dc564c4 100644
--- a/drivers/isdn/hisax/sportster.c
+++ b/drivers/isdn/hisax/sportster.c
@@ -19,7 +19,7 @@
 #include "isdnl1.h"
 extern const char *CardType[];
-const char *sportster_revision = "$Revision: 1.16.2.4 $";
+static const char *sportster_revision = "$Revision: 1.16.2.4 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -132,7 +132,7 @@ sportster_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_sportster(struct IsdnCardState *cs)
 {
        int i, adr;
@@ -144,7 +144,7 @@ release_io_sportster(struct IsdnCardState *cs)
        }
 }
-void
+static void
 reset_sportster(struct IsdnCardState *cs)
 {
        cs->hw.spt.res_irq |= SPORTSTER_RESET; /* Reset On */
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index e8177b017b1d..0fda5c89429b 100644
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -450,12 +450,8 @@ int st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev,
                           usb_complete_t complete, void *context);
 void st5481_release_isocpipes(struct urb* urb[2]);
-int  st5481_isoc_flatten(struct urb *urb);
 void st5481_usb_pipe_reset(struct st5481_adapter *adapter,
                    u_char pipe, ctrl_complete_t complete, void *context);
-void st5481_usb_ctrl_msg(struct st5481_adapter *adapter,
-                  u8 request, u8 requesttype, u16 value, u16 index,
-                  ctrl_complete_t complete, void *context);
 void st5481_usb_device_ctrl_msg(struct st5481_adapter *adapter,
                         u8 request, u16 value,
                         ctrl_complete_t complete, void *context);
diff --git a/drivers/isdn/hisax/st5481_hdlc.c b/drivers/isdn/hisax/st5481_hdlc.c
deleted file mode 100644
index 680f42e9a993..000000000000
--- a/drivers/isdn/hisax/st5481_hdlc.c
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
- * Driver for ST5481 USB ISDN modem
- *
- * Author       Frode Isaksen
- * Copyright    2001 by Frode Isaksen      <fisaksen@bewan.com>
- *              2001 by Kai Germaschewski  <kai.germaschewski@gmx.de>
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-#include <linux/crc-ccitt.h>
-#include "st5481_hdlc.h"
-enum {
-        HDLC_FAST_IDLE,HDLC_GET_FLAG_B0,HDLC_GETFLAG_B1A6,HDLC_GETFLAG_B7,
-        HDLC_GET_DATA,HDLC_FAST_FLAG
-};
-enum {
-        HDLC_SEND_DATA,HDLC_SEND_CRC1,HDLC_SEND_FAST_FLAG,
-        HDLC_SEND_FIRST_FLAG,HDLC_SEND_CRC2,HDLC_SEND_CLOSING_FLAG,
-        HDLC_SEND_IDLE1,HDLC_SEND_FAST_IDLE,HDLC_SENDFLAG_B0,
-        HDLC_SENDFLAG_B1A6,HDLC_SENDFLAG_B7,STOPPED
-};
-void 
-hdlc_rcv_init(struct hdlc_vars *hdlc, int do_adapt56)
-{
-        hdlc->bit_shift = 0;
-        hdlc->hdlc_bits1 = 0;
-        hdlc->data_bits = 0;
-        hdlc->ffbit_shift = 0;
-        hdlc->data_received = 0;
-        hdlc->state = HDLC_GET_DATA;
-        hdlc->do_adapt56 = do_adapt56;
-        hdlc->dchannel = 0;
-        hdlc->crc = 0;
-        hdlc->cbin = 0;
-        hdlc->shift_reg = 0;
-        hdlc->ffvalue = 0;
-        hdlc->dstpos = 0;
-}
-void 
-hdlc_out_init(struct hdlc_vars *hdlc, int is_d_channel, int do_adapt56)
-{
-        hdlc->bit_shift = 0;
-        hdlc->hdlc_bits1 = 0;
-        hdlc->data_bits = 0;
-        hdlc->ffbit_shift = 0;
-        hdlc->data_received = 0;
-        hdlc->do_closing = 0;
-        hdlc->ffvalue = 0;
-        if (is_d_channel) {
-                hdlc->dchannel = 1;
-                hdlc->state = HDLC_SEND_FIRST_FLAG;
-        } else {
-                hdlc->dchannel = 0;
-                hdlc->state = HDLC_SEND_FAST_FLAG;
-                hdlc->ffvalue = 0x7e;
-        } 
-        hdlc->cbin = 0x7e;
-        hdlc->bit_shift = 0;
-        if(do_adapt56){
-                hdlc->do_adapt56 = 1;           
-                hdlc->data_bits = 0;
-                hdlc->state = HDLC_SENDFLAG_B0;
-        } else {
-                hdlc->do_adapt56 = 0;           
-                hdlc->data_bits = 8;
-        }
-        hdlc->shift_reg = 0;
-}
-/*
-  hdlc_decode - decodes HDLC frames from a transparent bit stream.
-  The source buffer is scanned for valid HDLC frames looking for
-  flags (01111110) to indicate the start of a frame. If the start of
-  the frame is found, the bit stuffing is removed (0 after 5 1's).
-  When a new flag is found, the complete frame has been received
-  and the CRC is checked.
-  If a valid frame is found, the function returns the frame length 
-  excluding the CRC with the bit HDLC_END_OF_FRAME set.
-  If the beginning of a valid frame is found, the function returns
-  the length. 
-  If a framing error is found (too many 1s and not a flag) the function 
-  returns the length with the bit HDLC_FRAMING_ERROR set.
-  If a CRC error is found the function returns the length with the
-  bit HDLC_CRC_ERROR set.
-  If the frame length exceeds the destination buffer size, the function
-  returns the length with the bit HDLC_LENGTH_ERROR set.
-  src - source buffer
-  slen - source buffer length
-  count - number of bytes removed (decoded) from the source buffer
-  dst _ destination buffer
-  dsize - destination buffer size
-  returns - number of decoded bytes in the destination buffer and status
-  flag.
- */
-int hdlc_decode(struct hdlc_vars *hdlc, const unsigned char *src,
-                int slen, int *count, unsigned char *dst, int dsize)
-{
-        int status=0;
-        static const unsigned char fast_flag[]={
-                0x00,0x00,0x00,0x20,0x30,0x38,0x3c,0x3e,0x3f
-        };
-        static const unsigned char fast_flag_value[]={
-                0x00,0x7e,0xfc,0xf9,0xf3,0xe7,0xcf,0x9f,0x3f
-        };
-        static const unsigned char fast_abort[]={
-                0x00,0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff
-        };
-        *count = slen;
-        while(slen > 0){
-                if(hdlc->bit_shift==0){
-                        hdlc->cbin = *src++;
-                        slen--;
-                        hdlc->bit_shift = 8;
-                        if(hdlc->do_adapt56){
-                                hdlc->bit_shift --;
-                        }
-                }
-                switch(hdlc->state){
-                case STOPPED:
-                        return 0;
-                case HDLC_FAST_IDLE:
-                        if(hdlc->cbin == 0xff){
-                                hdlc->bit_shift = 0;
-                                break;
-                        }
-                        hdlc->state = HDLC_GET_FLAG_B0;
-                        hdlc->hdlc_bits1 = 0;
-                        hdlc->bit_shift = 8;
-                        break;
-                case HDLC_GET_FLAG_B0:
-                        if(!(hdlc->cbin & 0x80)) {
-                                hdlc->state = HDLC_GETFLAG_B1A6;
-                                hdlc->hdlc_bits1 = 0;
-                        } else {
-                                if(!hdlc->do_adapt56){
-                                        if(++hdlc->hdlc_bits1 >=8 ) if(hdlc->bit_shift==1)
-                                                hdlc->state = HDLC_FAST_IDLE;
-                                }
-                        }
-                        hdlc->cbin<<=1;
-                        hdlc->bit_shift --;
-                        break;
-                case HDLC_GETFLAG_B1A6:
-                        if(hdlc->cbin & 0x80){
-                                hdlc->hdlc_bits1++;
-                                if(hdlc->hdlc_bits1==6){
-                                        hdlc->state = HDLC_GETFLAG_B7;
-                                }
-                        } else {
-                                hdlc->hdlc_bits1 = 0;
-                        }
-                        hdlc->cbin<<=1;
-                        hdlc->bit_shift --;
-                        break;
-                case HDLC_GETFLAG_B7:
-                        if(hdlc->cbin & 0x80) {
-                                hdlc->state = HDLC_GET_FLAG_B0;
-                        } else {
-                                hdlc->state = HDLC_GET_DATA;
-                                hdlc->crc = 0xffff;
-                                hdlc->shift_reg = 0;
-                                hdlc->hdlc_bits1 = 0;
-                                hdlc->data_bits = 0;
-                                hdlc->data_received = 0;
-                        }
-                        hdlc->cbin<<=1;
-                        hdlc->bit_shift --;
-                        break;
-                case HDLC_GET_DATA:
-                        if(hdlc->cbin & 0x80){
-                                hdlc->hdlc_bits1++;
-                                switch(hdlc->hdlc_bits1){
-                                case 6:
-                                        break;
-                                case 7:
-                                        if(hdlc->data_received) {
-                                                // bad frame
-                                                status = -HDLC_FRAMING_ERROR;
-                                        }
-                                        if(!hdlc->do_adapt56){
-                                                if(hdlc->cbin==fast_abort[hdlc->bit_shift+1]){
-                                                        hdlc->state = HDLC_FAST_IDLE;
-                                                        hdlc->bit_shift=1;
-                                                        break;
-                                                }
-                                        } else {
-                                                hdlc->state = HDLC_GET_FLAG_B0;
-                                        }
-                                        break;
-                                default:
-                                        hdlc->shift_reg>>=1;
-                                        hdlc->shift_reg |= 0x80;
-                                        hdlc->data_bits++;
-                                        break;
-                                }
-                        } else {
-                                switch(hdlc->hdlc_bits1){
-                                case 5:
-                                        break;
-                                case 6:
-                                        if(hdlc->data_received){
-                                                if (hdlc->dstpos < 2) {
-                                                        status = -HDLC_FRAMING_ERROR;
-                                                } else if (hdlc->crc != 0xf0b8){
-                                                        // crc error
-                                                        status = -HDLC_CRC_ERROR;
-                                                } else {
-                                                        // remove CRC
-                                                        hdlc->dstpos -= 2;
-                                                        // good frame
-                                                        status = hdlc->dstpos;
-                                                }
-                                        }
-                                        hdlc->crc = 0xffff;
-                                        hdlc->shift_reg = 0;
-                                        hdlc->data_bits = 0;
-                                        if(!hdlc->do_adapt56){
-                                                if(hdlc->cbin==fast_flag[hdlc->bit_shift]){
-                                                        hdlc->ffvalue = fast_flag_value[hdlc->bit_shift];
-                                                        hdlc->state = HDLC_FAST_FLAG;
-                                                        hdlc->ffbit_shift = hdlc->bit_shift;
-                                                        hdlc->bit_shift = 1;
-                                                } else {
-                                                        hdlc->state = HDLC_GET_DATA;
-                                                        hdlc->data_received = 0;
-                                                }
-                                        } else {
-                                                hdlc->state = HDLC_GET_DATA;
-                                                hdlc->data_received = 0;
-                                        }
-                                        break;
-                                default:
-                                        hdlc->shift_reg>>=1;
-                                        hdlc->data_bits++;
-                                        break;
-                                }
-                                hdlc->hdlc_bits1 = 0;
-                        }
-                        if (status) {
-                                hdlc->dstpos = 0;
-                                *count -= slen;
-                                hdlc->cbin <<= 1;
-                                hdlc->bit_shift--;
-                                return status;
-                        }
-                        if(hdlc->data_bits==8){
-                                hdlc->data_bits = 0;
-                                hdlc->data_received = 1;
-                                hdlc->crc = crc_ccitt_byte(hdlc->crc, hdlc->shift_reg);
-                                // good byte received
-                                if (dsize--) {
-                                        dst[hdlc->dstpos++] = hdlc->shift_reg;
-                                } else {
-                                        // frame too long
-                                        status = -HDLC_LENGTH_ERROR;
-                                        hdlc->dstpos = 0;
-                                }
-                        }
-                        hdlc->cbin <<= 1;
-                        hdlc->bit_shift--;
-                        break;
-                case HDLC_FAST_FLAG:
-                        if(hdlc->cbin==hdlc->ffvalue){
-                                hdlc->bit_shift = 0;
-                                break;
-                        } else {
-                                if(hdlc->cbin == 0xff){
-                                        hdlc->state = HDLC_FAST_IDLE;
-                                        hdlc->bit_shift=0;
-                                } else if(hdlc->ffbit_shift==8){
-                                        hdlc->state = HDLC_GETFLAG_B7;
-                                        break;
-                                } else {
-                                        hdlc->shift_reg = fast_abort[hdlc->ffbit_shift-1];
-                                        hdlc->hdlc_bits1 = hdlc->ffbit_shift-2;
-                                        if(hdlc->hdlc_bits1<0)hdlc->hdlc_bits1 = 0;
-                                        hdlc->data_bits = hdlc->ffbit_shift-1;
-                                        hdlc->state = HDLC_GET_DATA;
-                                        hdlc->data_received = 0;
-                                }
-                        }
-                        break;
-                default:
-                        break;
-                }
-        }
-        *count -= slen;
-        return 0;
-}
-/*
-  hdlc_encode - encodes HDLC frames to a transparent bit stream.
-  The bit stream starts with a beginning flag (01111110). After
-  that each byte is added to the bit stream with bit stuffing added
-  (0 after 5 1's).
-  When the last byte has been removed from the source buffer, the
-  CRC (2 bytes is added) and the frame terminates with the ending flag.
-  For the dchannel, the idle character (all 1's) is also added at the end.
-  If this function is called with empty source buffer (slen=0), flags or
-  idle character will be generated.
- 
-  src - source buffer
-  slen - source buffer length
-  count - number of bytes removed (encoded) from source buffer
-  dst _ destination buffer
-  dsize - destination buffer size
-  returns - number of encoded bytes in the destination buffer
-*/
-int hdlc_encode(struct hdlc_vars *hdlc, const unsigned char *src, 
-                unsigned short slen, int *count,
-                unsigned char *dst, int dsize)
-{
-        static const unsigned char xfast_flag_value[] = {
-                0x7e,0x3f,0x9f,0xcf,0xe7,0xf3,0xf9,0xfc,0x7e
-        };
-        int len = 0;
-        *count = slen;
-        while (dsize > 0) {
-                if(hdlc->bit_shift==0){ 
-                        if(slen && !hdlc->do_closing){
-                                hdlc->shift_reg = *src++;
-                                slen--;
-                                if (slen == 0) 
-                                        hdlc->do_closing = 1;  /* closing sequence, CRC + flag(s) */
-                                hdlc->bit_shift = 8;
-                        } else {
-                                if(hdlc->state == HDLC_SEND_DATA){
-                                        if(hdlc->data_received){
-                                                hdlc->state = HDLC_SEND_CRC1;
-                                                hdlc->crc ^= 0xffff;
-                                                hdlc->bit_shift = 8;
-                                                hdlc->shift_reg = hdlc->crc & 0xff;
-                                        } else if(!hdlc->do_adapt56){
-                                                hdlc->state = HDLC_SEND_FAST_FLAG;
-                                        } else {
-                                                hdlc->state = HDLC_SENDFLAG_B0;
-                                        }
-                                }
-                          
-                        }
-                }
-                switch(hdlc->state){
-                case STOPPED:
-                        while (dsize--)
-                                *dst++ = 0xff;
-                  
-                        return dsize;
-                case HDLC_SEND_FAST_FLAG:
-                        hdlc->do_closing = 0;
-                        if(slen == 0){
-                                *dst++ = hdlc->ffvalue;
-                                len++;
-                                dsize--;
-                                break;
-                        }
-                        if(hdlc->bit_shift==8){
-                                hdlc->cbin = hdlc->ffvalue>>(8-hdlc->data_bits);
-                                hdlc->state = HDLC_SEND_DATA;
-                                hdlc->crc = 0xffff;
-                                hdlc->hdlc_bits1 = 0;
-                                hdlc->data_received = 1;
-                        }
-                        break;
-                case HDLC_SENDFLAG_B0:
-                        hdlc->do_closing = 0;
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        hdlc->hdlc_bits1 = 0;
-                        hdlc->state = HDLC_SENDFLAG_B1A6;
-                        break;
-                case HDLC_SENDFLAG_B1A6:
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        hdlc->cbin++;
-                        if(++hdlc->hdlc_bits1 == 6)
-                                hdlc->state = HDLC_SENDFLAG_B7;
-                        break;
-                case HDLC_SENDFLAG_B7:
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        if(slen == 0){
-                                hdlc->state = HDLC_SENDFLAG_B0;
-                                break;
-                        }
-                        if(hdlc->bit_shift==8){
-                                hdlc->state = HDLC_SEND_DATA;
-                                hdlc->crc = 0xffff;
-                                hdlc->hdlc_bits1 = 0;
-                                hdlc->data_received = 1;
-                        }
-                        break;
-                case HDLC_SEND_FIRST_FLAG:
-                        hdlc->data_received = 1;
-                        if(hdlc->data_bits==8){
-                                hdlc->state = HDLC_SEND_DATA;
-                                hdlc->crc = 0xffff;
-                                hdlc->hdlc_bits1 = 0;
-                                break;
-                        }
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        if(hdlc->shift_reg & 0x01)
-                                hdlc->cbin++;
-                        hdlc->shift_reg >>= 1;
-                        hdlc->bit_shift--;
-                        if(hdlc->bit_shift==0){
-                                hdlc->state = HDLC_SEND_DATA;
-                                hdlc->crc = 0xffff;
-                                hdlc->hdlc_bits1 = 0;
-                        }
-                        break;
-                case HDLC_SEND_DATA:
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        if(hdlc->hdlc_bits1 == 5){
-                                hdlc->hdlc_bits1 = 0;
-                                break;
-                        }
-                        if(hdlc->bit_shift==8){
-                                hdlc->crc = crc_ccitt_byte(hdlc->crc, hdlc->shift_reg);
-                        }
-                        if(hdlc->shift_reg & 0x01){
-                                hdlc->hdlc_bits1++;
-                                hdlc->cbin++;
-                                hdlc->shift_reg >>= 1;
-                                hdlc->bit_shift--;
-                        } else {
-                                hdlc->hdlc_bits1 = 0;
-                                hdlc->shift_reg >>= 1;
-                                hdlc->bit_shift--;
-                        }
-                        break;
-                case HDLC_SEND_CRC1:
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        if(hdlc->hdlc_bits1 == 5){
-                                hdlc->hdlc_bits1 = 0;
-                                break;
-                        }
-                        if(hdlc->shift_reg & 0x01){
-                                hdlc->hdlc_bits1++;
-                                hdlc->cbin++;
-                                hdlc->shift_reg >>= 1;
-                                hdlc->bit_shift--;
-                        } else {
-                                hdlc->hdlc_bits1 = 0;
-                                hdlc->shift_reg >>= 1;
-                                hdlc->bit_shift--;
-                        }
-                        if(hdlc->bit_shift==0){
-                                hdlc->shift_reg = (hdlc->crc >> 8);
-                                hdlc->state = HDLC_SEND_CRC2;
-                                hdlc->bit_shift = 8;
-                        }
-                        break;
-                case HDLC_SEND_CRC2:
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        if(hdlc->hdlc_bits1 == 5){
-                                hdlc->hdlc_bits1 = 0;
-                                break;
-                        }
-                        if(hdlc->shift_reg & 0x01){
-                                hdlc->hdlc_bits1++;
-                                hdlc->cbin++;
-                                hdlc->shift_reg >>= 1;
-                                hdlc->bit_shift--;
-                        } else {
-                                hdlc->hdlc_bits1 = 0;
-                                hdlc->shift_reg >>= 1;
-                                hdlc->bit_shift--;
-                        }
-                        if(hdlc->bit_shift==0){
-                                hdlc->shift_reg = 0x7e;
-                                hdlc->state = HDLC_SEND_CLOSING_FLAG;
-                                hdlc->bit_shift = 8;
-                        }
-                        break;
-                case HDLC_SEND_CLOSING_FLAG:
-                        hdlc->cbin <<= 1;
-                        hdlc->data_bits++;
-                        if(hdlc->hdlc_bits1 == 5){
-                                hdlc->hdlc_bits1 = 0;
-                                break;
-                        }
-                        if(hdlc->shift_reg & 0x01){
-                                hdlc->cbin++;
-                        }
-                        hdlc->shift_reg >>= 1;
-                        hdlc->bit_shift--;
-                        if(hdlc->bit_shift==0){
-                                hdlc->ffvalue = xfast_flag_value[hdlc->data_bits];
-                                if(hdlc->dchannel){
-                                        hdlc->ffvalue = 0x7e;
-                                        hdlc->state = HDLC_SEND_IDLE1;
-                                        hdlc->bit_shift = 8-hdlc->data_bits;
-                                        if(hdlc->bit_shift==0)
-                                                hdlc->state = HDLC_SEND_FAST_IDLE;
-                                } else {
-                                        if(!hdlc->do_adapt56){
-                                                hdlc->state = HDLC_SEND_FAST_FLAG;
-                                                hdlc->data_received = 0;
-                                        } else {
-                                                hdlc->state = HDLC_SENDFLAG_B0;
-                                                hdlc->data_received = 0;
-                                        }
-                                        // Finished with this frame, send flags
-                                        if (dsize > 1) dsize = 1; 
-                                }
-                        }
-                        break;
-                case HDLC_SEND_IDLE1:
-                        hdlc->do_closing = 0;
-                        hdlc->cbin <<= 1;
-                        hdlc->cbin++;
-                        hdlc->data_bits++;
-                        hdlc->bit_shift--;
-                        if(hdlc->bit_shift==0){
-                                hdlc->state = HDLC_SEND_FAST_IDLE;
-                                hdlc->bit_shift = 0;
-                        }
-                        break;
-                case HDLC_SEND_FAST_IDLE:
-                        hdlc->do_closing = 0;
-                        hdlc->cbin = 0xff;
-                        hdlc->data_bits = 8;
-                        if(hdlc->bit_shift == 8){
-                                hdlc->cbin = 0x7e;
-                                hdlc->state = HDLC_SEND_FIRST_FLAG;
-                        } else {
-                                *dst++ = hdlc->cbin;
-                                hdlc->bit_shift = hdlc->data_bits = 0;
-                                len++;
-                                dsize = 0;
-                        }
-                        break;
-                default:
-                        break;
-                }
-                if(hdlc->do_adapt56){
-                        if(hdlc->data_bits==7){
-                                hdlc->cbin <<= 1;
-                                hdlc->cbin++;
-                                hdlc->data_bits++;
-                        }
-                }
-                if(hdlc->data_bits==8){
-                        *dst++ = hdlc->cbin;
-                        hdlc->data_bits = 0;
-                        len++;
-                        dsize--;
-                }
-        }
-        *count -= slen;
-        return len;
-}
diff --git a/drivers/isdn/hisax/st5481_hdlc.h b/drivers/isdn/hisax/st5481_hdlc.h
deleted file mode 100644
index 495432f0f6ba..000000000000
--- a/drivers/isdn/hisax/st5481_hdlc.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Driver for ST5481 USB ISDN modem
- *
- * Author       Frode Isaksen
- * Copyright    2001 by Frode Isaksen      <fisaksen@bewan.com>
- *              2001 by Kai Germaschewski  <kai.germaschewski@gmx.de>
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-#ifndef __ST5481_HDLC_H__
-#define __ST5481_HDLC_H__
-struct hdlc_vars {
-        int bit_shift; 
-        int hdlc_bits1;
-        int data_bits;
-        int ffbit_shift; // encoding only
-        int state;
-        int dstpos;
-        int data_received:1; // set if transferring data
-        int dchannel:1; // set if D channel (send idle instead of flags)
-        int do_adapt56:1; // set if 56K adaptation
-        int do_closing:1; // set if in closing phase (need to send CRC + flag
-        unsigned short crc;
-        unsigned char cbin; 
-        unsigned char shift_reg;
-        unsigned char ffvalue;
-        
-};
-/*
-  The return value from hdlc_decode is
-  the frame length, 0 if no complete frame was decoded,
-  or a negative error number
-*/
-#define HDLC_FRAMING_ERROR     1
-#define HDLC_CRC_ERROR         2
-#define HDLC_LENGTH_ERROR      3
-void 
-hdlc_rcv_init(struct hdlc_vars *hdlc, int do_adapt56);
-int
-hdlc_decode(struct hdlc_vars *hdlc, const unsigned char *src, int slen,int *count, 
-            unsigned char *dst, int dsize);
-void 
-hdlc_out_init(struct hdlc_vars *hdlc,int is_d_channel,int do_adapt56);
-int 
-hdlc_encode(struct hdlc_vars *hdlc,const unsigned char *src,unsigned short slen,int *count,
-            unsigned char *dst,int dsize);
-#endif
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 2369180b1cb1..ab62223297a5 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -15,6 +15,8 @@
 #include <linux/slab.h>
 #include "st5481.h"
+static int st5481_isoc_flatten(struct urb *urb);
 /* ======================================================================
 * control pipe
 */
@@ -55,9 +57,9 @@ static void usb_next_ctrl_msg(struct urb *urb,
 * Asynchronous endpoint 0 request (async version of usb_control_msg).
 * The request will be queued up in a FIFO if the endpoint is busy.
 */
-void usb_ctrl_msg(struct st5481_adapter *adapter,
+static void usb_ctrl_msg(struct st5481_adapter *adapter,
-                  u8 request, u8 requesttype, u16 value, u16 index,
+                         u8 request, u8 requesttype, u16 value, u16 index,
-                  ctrl_complete_t complete, void *context)
+                         ctrl_complete_t complete, void *context)
 {
        struct st5481_ctrl *ctrl = &adapter->ctrl;
        int w_index;
@@ -571,7 +573,7 @@ void st5481_release_in(struct st5481_in *in)
 * Make the transfer_buffer contiguous by
 * copying from the iso descriptors if necessary. 
 */
-int st5481_isoc_flatten(struct urb *urb)
+static int st5481_isoc_flatten(struct urb *urb)
 {
        struct usb_iso_packet_descriptor *pipd,*pend;
        unsigned char *src,*dst;
diff --git a/drivers/isdn/hisax/tei.c b/drivers/isdn/hisax/tei.c
index 082726db3985..ceb0df92fd3e 100644
--- a/drivers/isdn/hisax/tei.c
+++ b/drivers/isdn/hisax/tei.c
@@ -74,7 +74,7 @@ static char *strTeiEvent[] =
        "EV_T202",
 };
-unsigned int
+static unsigned int
 random_ri(void)
 {
        unsigned int x;
diff --git a/drivers/isdn/hisax/teleint.c b/drivers/isdn/hisax/teleint.c
index ef8984c5f1f7..a2b1816af37a 100644
--- a/drivers/isdn/hisax/teleint.c
+++ b/drivers/isdn/hisax/teleint.c
@@ -18,7 +18,7 @@
 extern const char *CardType[];
-const char *TeleInt_revision = "$Revision: 1.16.2.5 $";
+static const char *TeleInt_revision = "$Revision: 1.16.2.5 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -203,7 +203,7 @@ TeleInt_Timer(struct IsdnCardState *cs)
        add_timer(&cs->hw.hfc.timer);
 }
-void
+static void
 release_io_TeleInt(struct IsdnCardState *cs)
 {
        del_timer(&cs->hw.hfc.timer);
diff --git a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c
index 5ec5ec3e1eab..2b7df8f98233 100644
--- a/drivers/isdn/hisax/teles0.c
+++ b/drivers/isdn/hisax/teles0.c
@@ -23,7 +23,7 @@
 extern const char *CardType[];
-const char *teles0_revision = "$Revision: 2.15.2.4 $";
+static const char *teles0_revision = "$Revision: 2.15.2.4 $";
 #define TELES_IOMEM_SIZE        0x400
 #define byteout(addr,val) outb(val,addr)
@@ -183,7 +183,7 @@ teles0_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_teles0(struct IsdnCardState *cs)
 {
        if (cs->hw.teles0.cfg_reg)
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index c5b1f65f7275..adeaad62d35c 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -21,7 +21,7 @@
 #include "isdnl1.h"
 extern const char *CardType[];
-const char *teles3_revision = "$Revision: 2.19.2.4 $";
+static const char *teles3_revision = "$Revision: 2.19.2.4 $";
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -154,7 +154,7 @@ release_ioregs(struct IsdnCardState *cs, int mask)
                release_region(cs->hw.teles3.hscx[1] + 32, 32);
 }
-void
+static void
 release_io_teles3(struct IsdnCardState *cs)
 {
        if (cs->typ == ISDN_CTYPE_TELESPCMCIA) {
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
index 0661c6c31ad0..e2bb4fd8e25e 100644
--- a/drivers/isdn/hisax/telespci.c
+++ b/drivers/isdn/hisax/telespci.c
@@ -21,7 +21,7 @@
 #include <linux/pci.h>
 extern const char *CardType[];
-const char *telespci_revision = "$Revision: 2.23.2.3 $";
+static const char *telespci_revision = "$Revision: 2.23.2.3 $";
 #define ZORAN_PO_RQ_PEN 0x02000000
 #define ZORAN_PO_WR     0x00800000
@@ -257,7 +257,7 @@ telespci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
-void
+static void
 release_io_telespci(struct IsdnCardState *cs)
 {
        iounmap(cs->hw.teles0.membase);
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
index d2b6b8e72980..7baf8e488471 100644
--- a/drivers/isdn/hisax/w6692.c
+++ b/drivers/isdn/hisax/w6692.c
@@ -41,7 +41,7 @@ static const PCI_ENTRY id_list[] =
 extern const char *CardType[];
-const char *w6692_revision = "$Revision: 1.18.2.4 $";
+static const char *w6692_revision = "$Revision: 1.18.2.4 $";
 #define DBUSY_TIMER_VALUE 80
@@ -880,7 +880,7 @@ setstack_w6692(struct PStack *st, struct BCState *bcs)
        return (0);
 }
-void resetW6692(struct IsdnCardState *cs)
+static void resetW6692(struct IsdnCardState *cs)
 {
        cs->writeW6692(cs, W_D_CTL, W_D_CTL_SRST);
        mdelay(10);
@@ -902,7 +902,7 @@ void resetW6692(struct IsdnCardState *cs)
        }
 }
-void __init initW6692(struct IsdnCardState *cs, int part)
+static void __init initW6692(struct IsdnCardState *cs, int part)
 {
        if (part & 1) {
                cs->setstack_d = setstack_W6692;
diff --git a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c
index 5350836a4f98..2cc56d6a9fae 100644
--- a/drivers/isdn/i4l/isdn_audio.c
+++ b/drivers/isdn/i4l/isdn_audio.c
@@ -392,16 +392,6 @@ isdn_audio_adpcm2xlaw(adpcm_state * s, int fmt, unsigned char *in,
 }
 int
-isdn_audio_2adpcm_flush(adpcm_state * s, unsigned char *out)
-{
-        int olen = 0;
-        if (s->nleft)
-                isdn_audio_put_bits(0, 8 - s->nleft, s, &out, &olen);
-        return olen;
-}
-int
 isdn_audio_xlaw2adpcm(adpcm_state * s, int fmt, unsigned char *in,
                      unsigned char *out, int len)
 {
diff --git a/drivers/isdn/i4l/isdn_audio.h b/drivers/isdn/i4l/isdn_audio.h
index 5a977b21dcfa..013c3582e0d1 100644
--- a/drivers/isdn/i4l/isdn_audio.h
+++ b/drivers/isdn/i4l/isdn_audio.h
@@ -35,7 +35,6 @@ extern void isdn_audio_alaw2ulaw(unsigned char *, unsigned long);
 extern adpcm_state *isdn_audio_adpcm_init(adpcm_state *, int);
 extern int isdn_audio_adpcm2xlaw(adpcm_state *, int, unsigned char *, unsigned char *, int);
 extern int isdn_audio_xlaw2adpcm(adpcm_state *, int, unsigned char *, unsigned char *, int);
-extern int isdn_audio_2adpcm_flush(adpcm_state * s, unsigned char *out);
 extern void isdn_audio_calc_dtmf(modem_info *, unsigned char *, int, int);
 extern void isdn_audio_eval_dtmf(modem_info *);
 dtmf_state *isdn_audio_dtmf_init(dtmf_state *);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index c406df6f268a..eebcb0b97f0e 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -67,7 +67,7 @@ static isdn_divert_if *divert_if; /* = NULL */
 static int isdn_writebuf_stub(int, int, const u_char __user *, int);
 static void set_global_features(void);
 static int isdn_wildmat(char *s, char *p);
+static int isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding);
 static inline void
 isdn_lock_driver(isdn_driver_t *drv)
@@ -388,7 +388,7 @@ isdn_all_eaz(int di, int ch)
 */
 #include <linux/isdn/capicmd.h>
-int
+static int
 isdn_capi_rec_hl_msg(capi_msg *cm) {
        
        int di;
@@ -1923,7 +1923,7 @@ isdn_writebuf_skb_stub(int drvidx, int chan, int ack, struct sk_buff *skb)
        return ret;
 }
-int
+static int
 isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding)
 {
        int j, k, m;
diff --git a/drivers/isdn/i4l/isdn_common.h b/drivers/isdn/i4l/isdn_common.h
index 808135c427ad..e27e9c3a81ed 100644
--- a/drivers/isdn/i4l/isdn_common.h
+++ b/drivers/isdn/i4l/isdn_common.h
@@ -41,7 +41,6 @@ extern int  isdn_get_free_channel(int, int, int, int, int, char *);
 extern int  isdn_writebuf_skb_stub(int, int, int, struct sk_buff *);
 extern int  register_isdn(isdn_if * i);
 extern int  isdn_msncmp( const char *,  const char *);
-extern int  isdn_add_channels(isdn_driver_t *, int, int, int);
 #if defined(ISDN_DEBUG_NET_DUMP) || defined(ISDN_DEBUG_MODEM_DUMP)
 extern void isdn_dumppkt(char *, u_char *, int, int);
 #endif
diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
index 83a4f5382bc2..0193b6f7c70c 100644
--- a/drivers/isdn/i4l/isdn_concap.c
+++ b/drivers/isdn/i4l/isdn_concap.c
@@ -39,7 +39,7 @@
   */
-int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb)
+static int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb)
 {
        struct net_device *ndev = concap -> net_dev;
        isdn_net_dev *nd = ((isdn_net_local *) ndev->priv)->netdev;
@@ -58,7 +58,7 @@ int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb)
 }
-int isdn_concap_dl_connect_req(struct concap_proto *concap)
+static int isdn_concap_dl_connect_req(struct concap_proto *concap)
 {
        struct net_device *ndev = concap -> net_dev;
        isdn_net_local *lp = (isdn_net_local *) ndev->priv;
@@ -71,7 +71,7 @@ int isdn_concap_dl_connect_req(struct concap_proto *concap)
        return ret;
 }
-int isdn_concap_dl_disconn_req(struct concap_proto *concap)
+static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
 {
        IX25DEBUG( "isdn_concap_dl_disconn_req: %s \n", concap -> net_dev -> name);
@@ -85,15 +85,6 @@ struct concap_device_ops isdn_concap_reliable_dl_dops = {
        &isdn_concap_dl_disconn_req
 };
-struct concap_device_ops isdn_concap_demand_dial_dops = {
-        NULL, /* set this first entry to something like &isdn_net_start_xmit,
-                 but the entry part of the current isdn_net_start_xmit must be
-                 separated first. */
-        /* no connection control for demand dial semantics */
-        NULL,
-        NULL,
-};
 /* The following should better go into a dedicated source file such that
   this sourcefile does not need to include any protocol specific header
   files. For now:
diff --git a/drivers/isdn/i4l/isdn_concap.h b/drivers/isdn/i4l/isdn_concap.h
index 306eb180438f..6ac7e0445ea5 100644
--- a/drivers/isdn/i4l/isdn_concap.h
+++ b/drivers/isdn/i4l/isdn_concap.h
@@ -8,7 +8,6 @@
 */
 extern struct concap_device_ops isdn_concap_reliable_dl_dops;
-extern struct concap_device_ops isdn_concap_demand_dial_dops;
 extern struct concap_proto * isdn_concap_new( int );
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index e2b790e34510..f30e8e63ae0d 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -176,7 +176,7 @@ static __inline__ void isdn_net_zero_frame_cnt(isdn_net_local *lp)
 /* Prototypes */
-int isdn_net_force_dial_lp(isdn_net_local *);
+static int isdn_net_force_dial_lp(isdn_net_local *);
 static int isdn_net_start_xmit(struct sk_buff *, struct net_device *);
 static void isdn_net_ciscohdlck_connected(isdn_net_local *lp);
@@ -312,7 +312,7 @@ isdn_net_unbind_channel(isdn_net_local * lp)
 * Since this function is called every second, simply reset the
 * byte-counter of the interface after copying it to the cps-variable.
 */
-unsigned long last_jiffies = -HZ;
+static unsigned long last_jiffies = -HZ;
 void
 isdn_net_autohup(void)
@@ -1131,7 +1131,7 @@ isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
 }
-void isdn_net_tx_timeout(struct net_device * ndev)
+static void isdn_net_tx_timeout(struct net_device * ndev)
 {
        isdn_net_local *lp = (isdn_net_local *) ndev->priv;
@@ -1424,7 +1424,7 @@ isdn_net_ciscohdlck_alloc_skb(isdn_net_local *lp, int len)
 }
 /* cisco hdlck device private ioctls */
-int
+static int
 isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        isdn_net_local *lp = (isdn_net_local *) dev->priv;
@@ -2461,7 +2461,7 @@ isdn_net_findif(char *name)
 * This is called from the userlevel-routine below or
 * from isdn_net_start_xmit().
 */
-int
+static int
 isdn_net_force_dial_lp(isdn_net_local * lp)
 {
        if ((!(lp->flags & ISDN_NET_CONNECTED)) && !lp->dialstate) {
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index e21007eca0f0..ad5aa38fb5a6 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -273,7 +273,7 @@ isdn_tty_rcv_skb(int i, int di, int channel, struct sk_buff *skb)
        return 1;
 }
-void
+static void
 isdn_tty_cleanup_xmit(modem_info * info)
 {
        skb_queue_purge(&info->xmit_queue);
@@ -560,7 +560,7 @@ isdn_tty_modem_ncarrier(modem_info * info)
 /*
 * return the usage calculated by si and layer 2 protocol
 */
-int
+static int
 isdn_calc_usage(int si, int l2)
 {
        int usg = ISDN_USAGE_MODEM;
diff --git a/drivers/isdn/i4l/isdn_tty.h b/drivers/isdn/i4l/isdn_tty.h
index 2423a7ff0cc3..9f0fa9501f4d 100644
--- a/drivers/isdn/i4l/isdn_tty.h
+++ b/drivers/isdn/i4l/isdn_tty.h
@@ -109,7 +109,6 @@ extern int  isdn_tty_modem_init(void);
 extern void isdn_tty_exit(void);
 extern void isdn_tty_readmodem(void);
 extern int  isdn_tty_find_icall(int, int, setup_parm *);
-extern void isdn_tty_cleanup_xmit(modem_info *);
 extern int  isdn_tty_stat_callback(int, isdn_ctrl *);
 extern int  isdn_tty_rcv_skb(int, int, int, struct sk_buff *);
 extern int  isdn_tty_capi_facility(capi_msg *cm); 
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c
index ce2c3ef92e46..a943d078bacc 100644
--- a/drivers/isdn/i4l/isdn_ttyfax.c
+++ b/drivers/isdn/i4l/isdn_ttyfax.c
@@ -148,7 +148,7 @@ isdn_tty_fax_modem_result(int code, modem_info * info)
        }
 }
-int
+static int
 isdn_tty_fax_command1(modem_info * info, isdn_ctrl * c)
 {
        static char *msg[] =
@@ -316,7 +316,7 @@ isdn_tty_fax_bitorder(modem_info * info, struct sk_buff *skb)
 * Parse AT+F.. FAX class 1 commands
 */
-int
+static int
 isdn_tty_cmd_FCLASS1(char **p, modem_info * info)
 {
        static char *cmd[] =
@@ -408,7 +408,7 @@ isdn_tty_cmd_FCLASS1(char **p, modem_info * info)
 * Parse AT+F.. FAX class 2 commands
 */
-int
+static int
 isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
 {
        atemu *m = &info->emu;
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index 4ab7600cf9c1..edf14a2aa3c8 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -40,15 +40,15 @@ typedef struct isdn_x25iface_proto_data {
 /* is now in header file (extern): struct concap_proto * isdn_x25iface_proto_new(void); */
-void isdn_x25iface_proto_del( struct concap_proto * );
+static void isdn_x25iface_proto_del( struct concap_proto * );
-int isdn_x25iface_proto_close( struct concap_proto * );
+static int isdn_x25iface_proto_close( struct concap_proto * );
-int isdn_x25iface_proto_restart( struct concap_proto *,
+static int isdn_x25iface_proto_restart( struct concap_proto *,
-                                 struct net_device *,
+                                        struct net_device *,
-                                 struct concap_device_ops *);
+                                        struct concap_device_ops *);
-int isdn_x25iface_xmit( struct concap_proto *, struct sk_buff * );
+static int isdn_x25iface_xmit( struct concap_proto *, struct sk_buff * );
-int isdn_x25iface_receive( struct concap_proto *, struct sk_buff * );
+static int isdn_x25iface_receive( struct concap_proto *, struct sk_buff * );
-int isdn_x25iface_connect_ind( struct concap_proto * );
+static int isdn_x25iface_connect_ind( struct concap_proto * );
-int isdn_x25iface_disconn_ind( struct concap_proto * );
+static int isdn_x25iface_disconn_ind( struct concap_proto * );
 static struct concap_proto_ops ix25_pops = {
@@ -102,7 +102,7 @@ struct concap_proto * isdn_x25iface_proto_new(void)
 /* close the x25iface encapsulation protocol 
 */
-int isdn_x25iface_proto_close(struct concap_proto *cprot){
+static int isdn_x25iface_proto_close(struct concap_proto *cprot){
        ix25_pdata_t *tmp;
        int ret = 0;
@@ -129,7 +129,7 @@ int isdn_x25iface_proto_close(struct concap_proto *cprot){
 /* Delete the x25iface encapsulation protocol instance
 */
-void isdn_x25iface_proto_del(struct concap_proto *cprot){
+static void isdn_x25iface_proto_del(struct concap_proto *cprot){
        ix25_pdata_t * tmp;
 
@@ -158,9 +158,9 @@ void isdn_x25iface_proto_del(struct concap_proto *cprot){
 /* (re-)initialize the data structures for x25iface encapsulation
 */
-int isdn_x25iface_proto_restart(struct concap_proto *cprot,
+static int isdn_x25iface_proto_restart(struct concap_proto *cprot,
-                                struct net_device *ndev, 
+                                        struct net_device *ndev,
-                                struct concap_device_ops *dops)
+                                        struct concap_device_ops *dops)
 {
        ix25_pdata_t * pda = cprot -> proto_data ;
        ulong flags;
@@ -187,7 +187,7 @@ int isdn_x25iface_proto_restart(struct concap_proto *cprot,
 /* deliver a dl_data frame received from i4l HL driver to the network layer 
 */
-int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb)
+static int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb)
 {
        IX25DEBUG( "isdn_x25iface_receive %s \n", MY_DEVNAME(cprot->net_dev) );
        if ( ( (ix25_pdata_t*) (cprot->proto_data) ) 
@@ -206,7 +206,7 @@ int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb)
 /* a connection set up is indicated by lower layer 
 */
-int isdn_x25iface_connect_ind(struct concap_proto *cprot)
+static int isdn_x25iface_connect_ind(struct concap_proto *cprot)
 {
        struct sk_buff * skb = dev_alloc_skb(1);
        enum wan_states *state_p 
@@ -235,7 +235,7 @@ int isdn_x25iface_connect_ind(struct concap_proto *cprot)
        
 /* a disconnect is indicated by lower layer 
 */
-int isdn_x25iface_disconn_ind(struct concap_proto *cprot)
+static int isdn_x25iface_disconn_ind(struct concap_proto *cprot)
 {
        struct sk_buff *skb;
        enum wan_states *state_p 
@@ -264,7 +264,7 @@ int isdn_x25iface_disconn_ind(struct concap_proto *cprot)
 /* process a frame handed over to us from linux network layer. First byte
   semantics as defined in Documentation/networking/x25-iface.txt
   */
-int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
+static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
 {
        unsigned char firstbyte = skb->data[0];
        enum wan_states *state = &((ix25_pdata_t*)cprot->proto_data)->state;
diff --git a/drivers/isdn/pcbit/callbacks.c b/drivers/isdn/pcbit/callbacks.c
index 692ec72d1ee8..f151f36c8255 100644
--- a/drivers/isdn/pcbit/callbacks.c
+++ b/drivers/isdn/pcbit/callbacks.c
@@ -125,23 +125,6 @@ void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan,
 /*
- * Disconnect received (actually RELEASE COMPLETE) 
- * This means we were not able to establish connection with remote
- * Inform the big boss above
- */
-void cb_out_3(struct pcbit_dev * dev, struct pcbit_chan* chan,
-              struct callb_data *data) 
-{
-        isdn_ctrl ictl;
-        ictl.command = ISDN_STAT_DHUP;
-        ictl.driver=dev->id;
-        ictl.arg=chan->id;
-        dev->dev_if->statcallb(&ictl);
-}
-/*
 * Incoming call received
 * inform user
 */
diff --git a/drivers/isdn/pcbit/callbacks.h b/drivers/isdn/pcbit/callbacks.h
index f510dc56b57e..17aa0f54bfc3 100644
--- a/drivers/isdn/pcbit/callbacks.h
+++ b/drivers/isdn/pcbit/callbacks.h
@@ -19,9 +19,6 @@ extern void cb_out_1(struct pcbit_dev * dev, struct pcbit_chan* chan,
 extern void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan, 
                     struct callb_data *data);
-extern void cb_out_3(struct pcbit_dev * dev, struct pcbit_chan* chan, 
-                     struct callb_data *data);
 extern void cb_in_1(struct pcbit_dev * dev, struct pcbit_chan* chan, 
                    struct callb_data *data);
 extern void cb_in_2(struct pcbit_dev * dev, struct pcbit_chan* chan, 
diff --git a/drivers/isdn/pcbit/capi.c b/drivers/isdn/pcbit/capi.c
index 29eb03a8c29d..bef321d0e51d 100644
--- a/drivers/isdn/pcbit/capi.c
+++ b/drivers/isdn/pcbit/capi.c
@@ -627,16 +627,6 @@ int capi_decode_disc_ind(struct pcbit_chan *chan, struct sk_buff *skb)
        return 0;
 }
-int capi_decode_disc_conf(struct pcbit_chan *chan, struct sk_buff *skb)
-{
-        ushort errcode;
-        errcode = *((ushort*) skb->data);
-        skb_pull(skb, 2);
-        return errcode;                
-}
 #ifdef DEBUG
 int capi_decode_debug_188(u_char *hdr, ushort hdrlen)
 {
diff --git a/drivers/isdn/pcbit/capi.h b/drivers/isdn/pcbit/capi.h
index 18e6aa360a8f..df8e73c04d7f 100644
--- a/drivers/isdn/pcbit/capi.h
+++ b/drivers/isdn/pcbit/capi.h
@@ -54,7 +54,6 @@ extern int capi_tdata_resp(struct pcbit_chan *chan, struct sk_buff ** skb);
 /* Connection Termination */
 extern int capi_disc_req(ushort callref, struct sk_buff **skb, u_char cause);
-extern int capi_decode_disc_conf(struct pcbit_chan *chan, struct sk_buff *skb);
 extern int capi_decode_disc_ind(struct pcbit_chan *chan, struct sk_buff *skb);
 extern int capi_disc_resp(struct pcbit_chan *chan, struct sk_buff **skb);
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index e98f9c48c184..5de861f40816 100644
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -56,10 +56,10 @@ static char* pcbit_devname[MAX_PCBIT_CARDS] = {
 * prototypes
 */
-int pcbit_command(isdn_ctrl* ctl);
+static int pcbit_command(isdn_ctrl* ctl);
-int pcbit_stat(u_char __user * buf, int len, int, int);
+static int pcbit_stat(u_char __user * buf, int len, int, int);
-int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb);
+static int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb);
-int pcbit_writecmd(const u_char __user *, int, int, int);
+static int pcbit_writecmd(const u_char __user *, int, int, int);
 static int set_protocol_running(struct pcbit_dev * dev);
@@ -238,7 +238,7 @@ void pcbit_terminate(int board)
 }
 #endif
-int pcbit_command(isdn_ctrl* ctl)
+static int pcbit_command(isdn_ctrl* ctl)
 {
        struct pcbit_dev  *dev;
        struct pcbit_chan *chan;
@@ -330,7 +330,7 @@ static void pcbit_block_timer(unsigned long data)
 }
 #endif
-int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
+static int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
 {
        ushort hdrlen;
        int refnum, len;
@@ -389,7 +389,7 @@ int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
        return len;
 }
-int pcbit_writecmd(const u_char __user *buf, int len, int driver, int channel)
+static int pcbit_writecmd(const u_char __user *buf, int len, int driver, int channel)
 {
        struct pcbit_dev * dev;
        int i, j;
@@ -713,7 +713,7 @@ static char statbuf[STATBUF_LEN];
 static int stat_st = 0;
 static int stat_end = 0;
-int pcbit_stat(u_char __user *buf, int len, int driver, int channel)
+static int pcbit_stat(u_char __user *buf, int len, int driver, int channel)
 {
        int stat_count;
        stat_count = stat_end - stat_st;
diff --git a/drivers/isdn/sc/Makefile b/drivers/isdn/sc/Makefile
index 9cc474cd0c44..0f2b7d602ac0 100644
--- a/drivers/isdn/sc/Makefile
+++ b/drivers/isdn/sc/Makefile
@@ -6,5 +6,5 @@ obj-$(CONFIG_ISDN_DRV_SC)	+= sc.o
 # Multipart objects.
-sc-y                            := shmem.o init.o debug.o packet.o command.o event.o \
+sc-y                            := shmem.o init.o packet.o command.o event.o \
                                   ioctl.o interrupt.o message.o timer.o        
diff --git a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c
index b2c4eac7cef5..19f2fcf0ae4a 100644
--- a/drivers/isdn/sc/command.c
+++ b/drivers/isdn/sc/command.c
@@ -22,14 +22,14 @@
 #include "card.h"
 #include "scioc.h"
-int dial(int card, unsigned long channel, setup_parm setup);
+static int dial(int card, unsigned long channel, setup_parm setup);
-int hangup(int card, unsigned long channel);
+static int hangup(int card, unsigned long channel);
-int answer(int card, unsigned long channel);
+static int answer(int card, unsigned long channel);
-int clreaz(int card, unsigned long channel);
+static int clreaz(int card, unsigned long channel);
-int seteaz(int card, unsigned long channel, char *);
+static int seteaz(int card, unsigned long channel, char *);
-int setl2(int card, unsigned long arg);
+static int setl2(int card, unsigned long arg);
-int setl3(int card, unsigned long arg);
+static int setl3(int card, unsigned long arg);
-int acceptb(int card, unsigned long channel);
+static int acceptb(int card, unsigned long channel);
 extern int cinst;
 extern board *sc_adapter[];
@@ -148,56 +148,6 @@ int command(isdn_ctrl *cmd)
 }
 /*
- * Confirm our ability to communicate with the board.  This test assumes no
- * other message activity is present
- */
-int loopback(int card) 
-{
-        int status;
-        static char testmsg[] = "Test Message";
-        RspMessage rspmsg;
-        if(!IS_VALID_CARD(card)) {
-                pr_debug("Invalid param: %d is not a valid card id\n", card);
-                return -ENODEV;
-        }
-        pr_debug("%s: Sending loopback message\n",
-                sc_adapter[card]->devicename);
-        /*
-         * Send the loopback message to confirm that memory transfer is
-         * operational
-         */
-        status = send_and_receive(card, CMPID, cmReqType1,
-                                  cmReqClass0,
-                                  cmReqMsgLpbk,
-                                  0,
-                                  (unsigned char) strlen(testmsg),
-                                  (unsigned char *)testmsg,
-                                  &rspmsg, SAR_TIMEOUT);
-        if (!status) {
-                pr_debug("%s: Loopback message successfully sent\n",
-                        sc_adapter[card]->devicename);
-                if(strcmp(rspmsg.msg_data.byte_array, testmsg)) {
-                        pr_debug("%s: Loopback return != sent\n",
-                                sc_adapter[card]->devicename);
-                        return -EIO;
-                }
-                return 0;
-        }
-        else {
-                pr_debug("%s: Send loopback message failed\n",
-                        sc_adapter[card]->devicename);
-                return -EIO;
-        }
-}
-/*
 * start the onboard firmware
 */
 int startproc(int card) 
@@ -222,16 +172,10 @@ int startproc(int card)
 }
-int loadproc(int card, char *data) 
-{
-        return -1;
-}
 /*
 * Dials the number passed in 
 */
-int dial(int card, unsigned long channel, setup_parm setup) 
+static int dial(int card, unsigned long channel, setup_parm setup)
 {
        int status;
        char Phone[48];
@@ -261,7 +205,7 @@ int dial(int card, unsigned long channel, setup_parm setup)
 /*
 * Answer an incoming call 
 */
-int answer(int card, unsigned long channel) 
+static int answer(int card, unsigned long channel)
 {
        if(!IS_VALID_CARD(card)) {
                pr_debug("Invalid param: %d is not a valid card id\n", card);
@@ -282,7 +226,7 @@ int answer(int card, unsigned long channel)
 /*
 * Hangup up the call on specified channel
 */
-int hangup(int card, unsigned long channel) 
+static int hangup(int card, unsigned long channel)
 {
        int status;
@@ -305,7 +249,7 @@ int hangup(int card, unsigned long channel)
 /*
 * Set the layer 2 protocol (X.25, HDLC, Raw)
 */
-int setl2(int card, unsigned long arg) 
+static int setl2(int card, unsigned long arg)
 {
        int status =0;
        int protocol,channel;
@@ -340,7 +284,7 @@ int setl2(int card, unsigned long arg)
 /*
 * Set the layer 3 protocol
 */
-int setl3(int card, unsigned long channel) 
+static int setl3(int card, unsigned long channel)
 {
        int protocol = channel >> 8;
@@ -355,7 +299,7 @@ int setl3(int card, unsigned long channel)
        return 0;
 }
-int acceptb(int card, unsigned long channel)
+static int acceptb(int card, unsigned long channel)
 {
        if(!IS_VALID_CARD(card)) {
                pr_debug("Invalid param: %d is not a valid card id\n", card);
@@ -374,7 +318,7 @@ int acceptb(int card, unsigned long channel)
        return 0;
 }
-int clreaz(int card, unsigned long arg)
+static int clreaz(int card, unsigned long arg)
 {
        if(!IS_VALID_CARD(card)) {
                pr_debug("Invalid param: %d is not a valid card id\n", card);
@@ -388,7 +332,7 @@ int clreaz(int card, unsigned long arg)
        return 0;
 }
-int seteaz(int card, unsigned long arg, char *num)
+static int seteaz(int card, unsigned long arg, char *num)
 {
        if(!IS_VALID_CARD(card)) {
                pr_debug("Invalid param: %d is not a valid card id\n", card);
diff --git a/drivers/isdn/sc/debug.c b/drivers/isdn/sc/debug.c
deleted file mode 100644
index 1a992a75868b..000000000000
--- a/drivers/isdn/sc/debug.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id: debug.c,v 1.5.6.1 2001/09/23 22:24:59 kai Exp $
- *
- * Copyright (C) 1996  SpellCaster Telecommunications Inc.
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- * For more information, please contact gpl-info@spellcast.com or write:
- *
- *     SpellCaster Telecommunications Inc.
- *     5621 Finch Avenue East, Unit #3
- *     Scarborough, Ontario  Canada
- *     M1B 2T9
- *     +1 (416) 297-8565
- *     +1 (416) 297-6433 Facsimile
- */
-#include <linux/kernel.h>
-#include <linux/string.h>
-int dbg_level = 0;
-static char dbg_funcname[255];
-void dbg_endfunc(void)
-{
-        if (dbg_level) {
-                printk("<-- Leaving function %s\n", dbg_funcname);
-                strcpy(dbg_funcname, "");
-        }
-}
-void dbg_func(char *func)
-{
-        strcpy(dbg_funcname, func);
-        if(dbg_level)
-                printk("--> Entering function %s\n", dbg_funcname);
-}
-inline void pullphone(char *dn, char *str)
-{
-        int i = 0;
-        while(dn[i] != ',')
-                str[i] = dn[i], i++;
-        str[i] = 0x0;
-}
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index efefedea37b9..40b0df04ed9f 100644
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -20,9 +20,9 @@ board *sc_adapter[MAX_CARDS];
 int cinst;
 static char devname[] = "scX";
-const char version[] = "2.0b1";
+static const char version[] = "2.0b1";
-const char *boardname[] = { "DataCommute/BRI", "DataCommute/PRI", "TeleCommute/BRI" };
+static const char *boardname[] = { "DataCommute/BRI", "DataCommute/PRI", "TeleCommute/BRI" };
 /* insmod set parameters */
 static unsigned int io[] = {0,0,0,0};
@@ -35,26 +35,13 @@ module_param_array(irq, int, NULL, 0);
 module_param_array(ram, int, NULL, 0);
 module_param(do_reset, bool, 0);
-static int sup_irq[] = { 11, 10, 9, 5, 12, 14, 7, 3, 4, 6 };
-#define MAX_IRQS        10
 extern irqreturn_t interrupt_handler(int, void *, struct pt_regs *);
 extern int sndpkt(int, int, int, struct sk_buff *);
 extern int command(isdn_ctrl *);
 extern int indicate_status(int, int, ulong, char*);
 extern int reset(int);
-int identify_board(unsigned long, unsigned int);
+static int identify_board(unsigned long, unsigned int);
-int irq_supported(int irq_x)
-{
-        int i;
-        for(i=0 ; i < MAX_IRQS ; i++) {
-                if(sup_irq[i] == irq_x)
-                        return 1;
-        }
-        return 0;
-}
 static int __init sc_init(void)
 {
@@ -454,7 +441,7 @@ static void __exit sc_exit(void)
        pr_info("SpellCaster ISA ISDN Adapter Driver Unloaded.\n");
 }
-int identify_board(unsigned long rambase, unsigned int iobase) 
+static int identify_board(unsigned long rambase, unsigned int iobase)
 {
        unsigned int pgport;
        unsigned long sig;
diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
index e5e164aca7fa..8631d338d69a 100644
--- a/drivers/isdn/sc/interrupt.c
+++ b/drivers/isdn/sc/interrupt.c
@@ -31,7 +31,7 @@ extern void rcvpkt(int, RspMessage *);
 extern int cinst;
 extern board *sc_adapter[];
-int get_card_from_irq(int irq)
+static int get_card_from_irq(int irq)
 {
        int i;
diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c
index 1371a990416a..3314a5a19854 100644
--- a/drivers/isdn/sc/ioctl.c
+++ b/drivers/isdn/sc/ioctl.c
@@ -14,7 +14,6 @@
 extern int indicate_status(int, int, unsigned long, char *);
 extern int startproc(int);
-extern int loadproc(int, char *record);
 extern int reset(int);
 extern int send_and_receive(int, unsigned int, unsigned char,unsigned char,
                unsigned char,unsigned char, 
@@ -23,7 +22,7 @@ extern int send_and_receive(int, unsigned int, unsigned char,unsigned char,
 extern board *sc_adapter[];
-int GetStatus(int card, boardInfo *);
+static int GetStatus(int card, boardInfo *);
 /*
 * Process private IOCTL messages (typically from scctrl)
@@ -428,7 +427,7 @@ int sc_ioctl(int card, scs_ioctl *data)
        return 0;
 }
-int GetStatus(int card, boardInfo *bi)
+static int GetStatus(int card, boardInfo *bi)
 {
        RspMessage rcvmsg;
        int i, status;
diff --git a/drivers/isdn/sc/packet.c b/drivers/isdn/sc/packet.c
index 8e3fac3ba1a1..f50defc38ae5 100644
--- a/drivers/isdn/sc/packet.c
+++ b/drivers/isdn/sc/packet.c
@@ -213,19 +213,3 @@ int setup_buffers(int card, int c)
        return 0;
 }
-int print_skb(int card,char *skb_p, int len){
-        int i,data;
-        pr_debug("%s: data at 0x%x len: 0x%x\n", sc_adapter[card]->devicename,
-                        skb_p,len);
-        for(i=1;i<=len;i++,skb_p++){
-                data = (int) (0xff & (*skb_p));
-                pr_debug("%s: data =  0x%x", sc_adapter[card]->devicename,data);
-                if(!(i%4))
-                        pr_debug(" ");
-                if(!(i%32))
-                        pr_debug("\n");
-        }
-        pr_debug("\n");
-        return 0;
-}               
diff --git a/drivers/isdn/sc/shmem.c b/drivers/isdn/sc/shmem.c
index 7bc2dfad0775..24854826ca45 100644
--- a/drivers/isdn/sc/shmem.c
+++ b/drivers/isdn/sc/shmem.c
@@ -108,6 +108,7 @@ void memcpy_fromshmem(int card, void *dest, const void *src, size_t n)
                sc_adapter[card]->rambase + ((unsigned long) src %0x4000), (unsigned long) dest); */
 }
+#if 0
 void memset_shmem(int card, void *dest, int c, size_t n)
 {
        unsigned long flags;
@@ -141,3 +142,4 @@ void memset_shmem(int card, void *dest, int c, size_t n)
                ((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);
        spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
 }
+#endif  /*  0  */
diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c
index 710d0f47ca35..aced19aac5a2 100644
--- a/drivers/isdn/sc/timer.c
+++ b/drivers/isdn/sc/timer.c
@@ -32,7 +32,7 @@ extern int  sendmessage(int, unsigned int, unsigned int, unsigned int,
 /*
 * Write the proper values into the I/O ports following a reset
 */
-void setup_ports(int card)
+static void setup_ports(int card)
 {
        outb((sc_adapter[card]->rambase >> 12), sc_adapter[card]->ioport[EXP_BASE]);
@@ -129,19 +129,3 @@ void check_phystat(unsigned long data)
                ceReqPhyStatus,0,0,NULL);
 }
-/*
- * When in trace mode, this callback is used to swap the working shared
- * RAM page to the trace page(s) and process all received messages. It
- * must be called often enough to get all of the messages out of RAM before
- * it loops around.
- * Trace messages are \n terminated strings.
- * We output the messages in 64 byte chunks through readstat. Each chunk
- * is scanned for a \n followed by a time stamp. If the timerstamp is older
- * than the current time, scanning stops and the page and offset are recorded
- * as the starting point the next time the trace timer is called. The final
- * step is to restore the working page and reset the timer.
- */
-void trace_timer(unsigned long data)
-{
-        /* not implemented */
-}
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 5ba190ce14a0..c9ca1118e449 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -328,9 +328,7 @@ static int monitor_task(void *arg)
        struct thermostat* th = arg;
        while(!kthread_should_stop()) {
-                if (current->flags & PF_FREEZE)
+                try_to_freeze();
-                        refrigerator(PF_FREEZE);
                msleep_interruptible(2000);
 #ifndef DEBUG
diff --git a/drivers/mca/mca-legacy.c b/drivers/mca/mca-legacy.c
index af56313ba0af..0c7bfa74c8ef 100644
--- a/drivers/mca/mca-legacy.c
+++ b/drivers/mca/mca-legacy.c
@@ -180,7 +180,6 @@ struct mca_device *mca_find_device_by_slot(int slot)
        return info.mca_dev;
 }
-EXPORT_SYMBOL(mca_find_device_by_slot);
 /**
 *      mca_read_stored_pos - read POS register from boot data
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0c6b5b6baff6..3802f7a17f16 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2976,8 +2976,7 @@ static int md_thread(void * arg)
                wait_event_interruptible_timeout(thread->wqueue,
                                                 test_bit(THREAD_WAKEUP, &thread->flags),
                                                 thread->timeout);
-                if (current->flags & PF_FREEZE)
+                try_to_freeze();
-                        refrigerator(PF_FREEZE);
                clear_bit(THREAD_WAKEUP, &thread->flags);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index d6b7a9de471e..f11daae91cd4 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -391,8 +391,7 @@ static int dvb_frontend_thread(void *data)
                        break;
                }
-                if (current->flags & PF_FREEZE)
+                try_to_freeze();
-                        refrigerator(PF_FREEZE);
                if (down_interruptible(&fepriv->sem))
                        break;
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index ac0dc27bb38f..867e988a5a93 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -435,7 +435,6 @@ struct cx8802_dev {
 /* ----------------------------------------------------------- */
 /* cx88-core.c                                                 */
-extern char *cx88_pci_irqs[32];
 extern char *cx88_vid_irqs[32];
 extern char *cx88_mpeg_irqs[32];
 extern void cx88_print_irqbits(char *name, char *tag, char **strings,
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 1b7d38e96f14..b4ee9dfe6d42 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -750,8 +750,7 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
 #endif
                }
        }
-        if (current->flags & PF_FREEZE)
+        try_to_freeze();
-                refrigerator(PF_FREEZE);
        remove_wait_queue(&msp->wq, &wait);
        return msp->restart;
 }
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 5f870075b55e..15f5bb486963 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -62,8 +62,7 @@ static int videobuf_dvb_thread(void *data)
                        break;
                if (kthread_should_stop())
                        break;
-                if (current->flags & PF_FREEZE)
+                try_to_freeze();
-                        refrigerator(PF_FREEZE);
                /* feed buffer data to demux */
                if (buf->state == STATE_DONE)
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 047202c4d9a8..5a4a08a7c951 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1606,7 +1606,7 @@ static int rtl8139_thread (void *data)
                do {
                        timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
                        /* make swsusp happy with our thread */
-                        try_to_freeze(PF_FREEZE);
+                        try_to_freeze();
                } while (!signal_pending (current) && (timeout > 0));
                if (signal_pending (current)) {
diff --git a/drivers/net/irda/sir_kthread.c b/drivers/net/irda/sir_kthread.c
index 18cea1099530..c65054364bca 100644
--- a/drivers/net/irda/sir_kthread.c
+++ b/drivers/net/irda/sir_kthread.c
@@ -135,8 +135,7 @@ static int irda_thread(void *startup)
                remove_wait_queue(&irda_rq_queue.kick, &wait);
                /* make swsusp happy with our thread */
-                if (current->flags & PF_FREEZE)
+                try_to_freeze();
-                        refrigerator(PF_FREEZE);
                run_irda_queue();
        }
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 66f488c13717..15f207323d97 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -763,7 +763,7 @@ static int stir_transmit_thread(void *arg)
        {
 #ifdef CONFIG_PM
                /* if suspending, then power off and wait */
-                if (unlikely(current->flags & PF_FREEZE)) {
+                if (unlikely(freezing(current))) {
                        if (stir->receiving)
                                receive_stop(stir);
                        else
@@ -771,7 +771,7 @@ static int stir_transmit_thread(void *arg)
                        write_reg(stir, REG_CTRL1, CTRL1_TXPWD|CTRL1_RXPWD);
-                        refrigerator(PF_FREEZE);
+                        refrigerator();
                        if (change_speed(stir, stir->speed))
                                break;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index a0b8848049c9..7e371b1209a1 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -66,8 +66,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.31"
+#define DRV_MODULE_VERSION      "3.32"
-#define DRV_MODULE_RELDATE      "June 8, 2005"
+#define DRV_MODULE_RELDATE      "June 24, 2005"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -337,12 +337,10 @@ static struct {
 static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val)
 {
        if ((tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) != 0) {
-                unsigned long flags;
+                spin_lock_bh(&tp->indirect_lock);
-                spin_lock_irqsave(&tp->indirect_lock, flags);
                pci_write_config_dword(tp->pdev, TG3PCI_REG_BASE_ADDR, off);
                pci_write_config_dword(tp->pdev, TG3PCI_REG_DATA, val);
-                spin_unlock_irqrestore(&tp->indirect_lock, flags);
+                spin_unlock_bh(&tp->indirect_lock);
        } else {
                writel(val, tp->regs + off);
                if ((tp->tg3_flags & TG3_FLAG_5701_REG_WRITE_BUG) != 0)
@@ -353,12 +351,10 @@ static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val)
 static void _tw32_flush(struct tg3 *tp, u32 off, u32 val)
 {
        if ((tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) != 0) {
-                unsigned long flags;
+                spin_lock_bh(&tp->indirect_lock);
-                spin_lock_irqsave(&tp->indirect_lock, flags);
                pci_write_config_dword(tp->pdev, TG3PCI_REG_BASE_ADDR, off);
                pci_write_config_dword(tp->pdev, TG3PCI_REG_DATA, val);
-                spin_unlock_irqrestore(&tp->indirect_lock, flags);
+                spin_unlock_bh(&tp->indirect_lock);
        } else {
                void __iomem *dest = tp->regs + off;
                writel(val, dest);
@@ -398,28 +394,24 @@ static inline void _tw32_tx_mbox(struct tg3 *tp, u32 off, u32 val)
 static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val)
 {
-        unsigned long flags;
+        spin_lock_bh(&tp->indirect_lock);
-        spin_lock_irqsave(&tp->indirect_lock, flags);
        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
        /* Always leave this as zero. */
        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-        spin_unlock_irqrestore(&tp->indirect_lock, flags);
+        spin_unlock_bh(&tp->indirect_lock);
 }
 static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
 {
-        unsigned long flags;
+        spin_lock_bh(&tp->indirect_lock);
-        spin_lock_irqsave(&tp->indirect_lock, flags);
        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
        pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
        /* Always leave this as zero. */
        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-        spin_unlock_irqrestore(&tp->indirect_lock, flags);
+        spin_unlock_bh(&tp->indirect_lock);
 }
 static void tg3_disable_ints(struct tg3 *tp)
@@ -438,12 +430,14 @@ static inline void tg3_cond_int(struct tg3 *tp)
 static void tg3_enable_ints(struct tg3 *tp)
 {
+        tp->irq_sync = 0;
+        wmb();
        tw32(TG3PCI_MISC_HOST_CTRL,
             (tp->misc_host_ctrl & ~MISC_HOST_CTRL_MASK_PCI_INT));
        tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
                     (tp->last_tag << 24));
        tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW);
        tg3_cond_int(tp);
 }
@@ -492,6 +486,7 @@ static void tg3_restart_ints(struct tg3 *tp)
 static inline void tg3_netif_stop(struct tg3 *tp)
 {
+        tp->dev->trans_start = jiffies; /* prevent tx timeout */
        netif_poll_disable(tp->dev);
        netif_tx_disable(tp->dev);
 }
@@ -504,7 +499,8 @@ static inline void tg3_netif_start(struct tg3 *tp)
         * (such as after tg3_init_hw)
         */
        netif_poll_enable(tp->dev);
-        tg3_cond_int(tp);
+        tp->hw_status->status |= SD_STATUS_UPDATED;
+        tg3_enable_ints(tp);
 }
 static void tg3_switch_clocks(struct tg3 *tp)
@@ -2578,7 +2574,7 @@ static void tg3_tx(struct tg3 *tp)
                        sw_idx = NEXT_TX(sw_idx);
                }
-                dev_kfree_skb_irq(skb);
+                dev_kfree_skb(skb);
        }
        tp->tx_cons = sw_idx;
@@ -2884,11 +2880,8 @@ static int tg3_poll(struct net_device *netdev, int *budget)
 {
        struct tg3 *tp = netdev_priv(netdev);
        struct tg3_hw_status *sblk = tp->hw_status;
-        unsigned long flags;
        int done;
-        spin_lock_irqsave(&tp->lock, flags);
        /* handle link change and other phy events */
        if (!(tp->tg3_flags &
              (TG3_FLAG_USE_LINKCHG_REG |
@@ -2896,7 +2889,9 @@ static int tg3_poll(struct net_device *netdev, int *budget)
                if (sblk->status & SD_STATUS_LINK_CHG) {
                        sblk->status = SD_STATUS_UPDATED |
                                (sblk->status & ~SD_STATUS_LINK_CHG);
+                        spin_lock(&tp->lock);
                        tg3_setup_phy(tp, 0);
+                        spin_unlock(&tp->lock);
                }
        }
@@ -2907,8 +2902,6 @@ static int tg3_poll(struct net_device *netdev, int *budget)
                spin_unlock(&tp->tx_lock);
        }
-        spin_unlock_irqrestore(&tp->lock, flags);
        /* run RX thread, within the bounds set by NAPI.
         * All RX "locking" is done by ensuring outside
         * code synchronizes with dev->poll()
@@ -2929,19 +2922,54 @@ static int tg3_poll(struct net_device *netdev, int *budget)
        if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
                tp->last_tag = sblk->status_tag;
        rmb();
+        sblk->status &= ~SD_STATUS_UPDATED;
        /* if no more work, tell net stack and NIC we're done */
        done = !tg3_has_work(tp);
        if (done) {
-                spin_lock_irqsave(&tp->lock, flags);
+                spin_lock(&tp->lock);
-                __netif_rx_complete(netdev);
+                netif_rx_complete(netdev);
                tg3_restart_ints(tp);
-                spin_unlock_irqrestore(&tp->lock, flags);
+                spin_unlock(&tp->lock);
        }
        return (done ? 0 : 1);
 }
+static void tg3_irq_quiesce(struct tg3 *tp)
+{
+        BUG_ON(tp->irq_sync);
+        tp->irq_sync = 1;
+        smp_mb();
+        synchronize_irq(tp->pdev->irq);
+}
+static inline int tg3_irq_sync(struct tg3 *tp)
+{
+        return tp->irq_sync;
+}
+/* Fully shutdown all tg3 driver activity elsewhere in the system.
+ * If irq_sync is non-zero, then the IRQ handler must be synchronized
+ * with as well.  Most of the time, this is not necessary except when
+ * shutting down the device.
+ */
+static inline void tg3_full_lock(struct tg3 *tp, int irq_sync)
+{
+        if (irq_sync)
+                tg3_irq_quiesce(tp);
+        spin_lock_bh(&tp->lock);
+        spin_lock(&tp->tx_lock);
+}
+static inline void tg3_full_unlock(struct tg3 *tp)
+{
+        spin_unlock(&tp->tx_lock);
+        spin_unlock_bh(&tp->lock);
+}
 /* MSI ISR - No need to check for interrupt sharing and no need to
 * flush status block and interrupt mailbox. PCI ordering rules
 * guarantee that MSI will arrive after the status block.
@@ -2951,9 +2979,6 @@ static irqreturn_t tg3_msi(int irq, void *dev_id, struct pt_regs *regs)
        struct net_device *dev = dev_id;
        struct tg3 *tp = netdev_priv(dev);
        struct tg3_hw_status *sblk = tp->hw_status;
-        unsigned long flags;
-        spin_lock_irqsave(&tp->lock, flags);
        /*
         * Writing any value to intr-mbox-0 clears PCI INTA# and
@@ -2964,6 +2989,9 @@ static irqreturn_t tg3_msi(int irq, void *dev_id, struct pt_regs *regs)
         */
        tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
        tp->last_tag = sblk->status_tag;
+        rmb();
+        if (tg3_irq_sync(tp))
+                goto out;
        sblk->status &= ~SD_STATUS_UPDATED;
        if (likely(tg3_has_work(tp)))
                netif_rx_schedule(dev);         /* schedule NAPI poll */
@@ -2972,9 +3000,7 @@ static irqreturn_t tg3_msi(int irq, void *dev_id, struct pt_regs *regs)
                tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
                             tp->last_tag << 24);
        }
+out:
-        spin_unlock_irqrestore(&tp->lock, flags);
        return IRQ_RETVAL(1);
 }
@@ -2983,11 +3009,8 @@ static irqreturn_t tg3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        struct net_device *dev = dev_id;
        struct tg3 *tp = netdev_priv(dev);
        struct tg3_hw_status *sblk = tp->hw_status;
-        unsigned long flags;
        unsigned int handled = 1;
-        spin_lock_irqsave(&tp->lock, flags);
        /* In INTx mode, it is possible for the interrupt to arrive at
         * the CPU before the status block posted prior to the interrupt.
         * Reading the PCI State register will confirm whether the
@@ -3004,6 +3027,8 @@ static irqreturn_t tg3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 */
                tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
                             0x00000001);
+                if (tg3_irq_sync(tp))
+                        goto out;
                sblk->status &= ~SD_STATUS_UPDATED;
                if (likely(tg3_has_work(tp)))
                        netif_rx_schedule(dev);         /* schedule NAPI poll */
@@ -3018,9 +3043,7 @@ static irqreturn_t tg3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        } else {        /* shared interrupt */
                handled = 0;
        }
+out:
-        spin_unlock_irqrestore(&tp->lock, flags);
        return IRQ_RETVAL(handled);
 }
@@ -3029,11 +3052,8 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id, struct pt_regs *r
        struct net_device *dev = dev_id;
        struct tg3 *tp = netdev_priv(dev);
        struct tg3_hw_status *sblk = tp->hw_status;
-        unsigned long flags;
        unsigned int handled = 1;
-        spin_lock_irqsave(&tp->lock, flags);
        /* In INTx mode, it is possible for the interrupt to arrive at
         * the CPU before the status block posted prior to the interrupt.
         * Reading the PCI State register will confirm whether the
@@ -3051,6 +3071,9 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id, struct pt_regs *r
                tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
                             0x00000001);
                tp->last_tag = sblk->status_tag;
+                rmb();
+                if (tg3_irq_sync(tp))
+                        goto out;
                sblk->status &= ~SD_STATUS_UPDATED;
                if (likely(tg3_has_work(tp)))
                        netif_rx_schedule(dev);         /* schedule NAPI poll */
@@ -3065,9 +3088,7 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id, struct pt_regs *r
        } else {        /* shared interrupt */
                handled = 0;
        }
+out:
-        spin_unlock_irqrestore(&tp->lock, flags);
        return IRQ_RETVAL(handled);
 }
@@ -3106,8 +3127,7 @@ static void tg3_reset_task(void *_data)
        tg3_netif_stop(tp);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 1);
-        spin_lock(&tp->tx_lock);
        restart_timer = tp->tg3_flags2 & TG3_FLG2_RESTART_TIMER;
        tp->tg3_flags2 &= ~TG3_FLG2_RESTART_TIMER;
@@ -3117,8 +3137,7 @@ static void tg3_reset_task(void *_data)
        tg3_netif_start(tp);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        if (restart_timer)
                mod_timer(&tp->timer, jiffies + 1);
@@ -3224,39 +3243,21 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
        unsigned int i;
        u32 len, entry, base_flags, mss;
        int would_hit_hwbug;
-        unsigned long flags;
        len = skb_headlen(skb);
        /* No BH disabling for tx_lock here.  We are running in BH disabled
         * context and TX reclaim runs via tp->poll inside of a software
-         * interrupt.  Rejoice!
+         * interrupt.  Furthermore, IRQ processing runs lockless so we have
-         *
+         * no IRQ context deadlocks to worry about either.  Rejoice!
-         * Actually, things are not so simple.  If we are to take a hw
-         * IRQ here, we can deadlock, consider:
-         *
-         *       CPU1           CPU2
-         *   tg3_start_xmit
-         *   take tp->tx_lock
-         *                      tg3_timer
-         *                      take tp->lock
-         *   tg3_interrupt
-         *   spin on tp->lock
-         *                      spin on tp->tx_lock
-         *
-         * So we really do need to disable interrupts when taking
-         * tx_lock here.
         */
-        local_irq_save(flags);
+        if (!spin_trylock(&tp->tx_lock))
-        if (!spin_trylock(&tp->tx_lock)) { 
-                local_irq_restore(flags);
                return NETDEV_TX_LOCKED; 
-        } 
        /* This is a hard error, log it. */
        if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
                netif_stop_queue(dev);
-                spin_unlock_irqrestore(&tp->tx_lock, flags);
+                spin_unlock(&tp->tx_lock);
                printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
                       dev->name);
                return NETDEV_TX_BUSY;
@@ -3421,7 +3422,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 out_unlock:
        mmiowb();
-        spin_unlock_irqrestore(&tp->tx_lock, flags);
+        spin_unlock(&tp->tx_lock);
        dev->trans_start = jiffies;
@@ -3455,8 +3456,8 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
        }
        tg3_netif_stop(tp);
-        spin_lock_irq(&tp->lock);
-        spin_lock(&tp->tx_lock);
+        tg3_full_lock(tp, 1);
        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
@@ -3466,8 +3467,7 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
        tg3_netif_start(tp);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        return 0;
 }
@@ -5088,9 +5088,9 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-        spin_lock_irq(&tp->lock);
+        spin_lock_bh(&tp->lock);
        __tg3_set_mac_addr(tp);
-        spin_unlock_irq(&tp->lock);
+        spin_unlock_bh(&tp->lock);
        return 0;
 }
@@ -5727,9 +5727,6 @@ static int tg3_reset_hw(struct tg3 *tp)
        tg3_write_sig_post_reset(tp, RESET_KIND_INIT);
-        if (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE)
-                tg3_enable_ints(tp);
        return 0;
 }
@@ -5802,10 +5799,8 @@ static void tg3_periodic_fetch_stats(struct tg3 *tp)
 static void tg3_timer(unsigned long __opaque)
 {
        struct tg3 *tp = (struct tg3 *) __opaque;
-        unsigned long flags;
-        spin_lock_irqsave(&tp->lock, flags);
+        spin_lock(&tp->lock);
-        spin_lock(&tp->tx_lock);
        if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
                /* All of this garbage is because when using non-tagged
@@ -5822,8 +5817,7 @@ static void tg3_timer(unsigned long __opaque)
                if (!(tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
                        tp->tg3_flags2 |= TG3_FLG2_RESTART_TIMER;
-                        spin_unlock(&tp->tx_lock);
+                        spin_unlock(&tp->lock);
-                        spin_unlock_irqrestore(&tp->lock, flags);
                        schedule_work(&tp->reset_task);
                        return;
                }
@@ -5891,8 +5885,7 @@ static void tg3_timer(unsigned long __opaque)
                tp->asf_counter = tp->asf_multiplier;
        }
-        spin_unlock(&tp->tx_lock);
+        spin_unlock(&tp->lock);
-        spin_unlock_irqrestore(&tp->lock, flags);
        tp->timer.expires = jiffies + tp->timer_offset;
        add_timer(&tp->timer);
@@ -6007,14 +6000,12 @@ static int tg3_test_msi(struct tg3 *tp)
        /* Need to reset the chip because the MSI cycle may have terminated
         * with Master Abort.
         */
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 1);
-        spin_lock(&tp->tx_lock);
        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
        err = tg3_init_hw(tp);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        if (err)
                free_irq(tp->pdev->irq, dev);
@@ -6027,14 +6018,12 @@ static int tg3_open(struct net_device *dev)
        struct tg3 *tp = netdev_priv(dev);
        int err;
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        tg3_disable_ints(tp);
        tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        /* The placement of this call is tied
         * to the setup and use of Host TX descriptors.
@@ -6081,8 +6070,7 @@ static int tg3_open(struct net_device *dev)
                return err;
        }
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        err = tg3_init_hw(tp);
        if (err) {
@@ -6106,8 +6094,7 @@ static int tg3_open(struct net_device *dev)
                tp->timer.function = tg3_timer;
        }
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        if (err) {
                free_irq(tp->pdev->irq, dev);
@@ -6123,8 +6110,7 @@ static int tg3_open(struct net_device *dev)
                err = tg3_test_msi(tp);
                if (err) {
-                        spin_lock_irq(&tp->lock);
+                        tg3_full_lock(tp, 0);
-                        spin_lock(&tp->tx_lock);
                        if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {
                                pci_disable_msi(tp->pdev);
@@ -6134,22 +6120,19 @@ static int tg3_open(struct net_device *dev)
                        tg3_free_rings(tp);
                        tg3_free_consistent(tp);
-                        spin_unlock(&tp->tx_lock);
+                        tg3_full_unlock(tp);
-                        spin_unlock_irq(&tp->lock);
                        return err;
                }
        }
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        add_timer(&tp->timer);
        tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;
        tg3_enable_ints(tp);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        netif_start_queue(dev);
@@ -6395,8 +6378,7 @@ static int tg3_close(struct net_device *dev)
        del_timer_sync(&tp->timer);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 1);
-        spin_lock(&tp->tx_lock);
 #if 0
        tg3_dump_state(tp);
 #endif
@@ -6410,8 +6392,7 @@ static int tg3_close(struct net_device *dev)
                  TG3_FLAG_GOT_SERDES_FLOWCTL);
        netif_carrier_off(tp->dev);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        free_irq(tp->pdev->irq, dev);
        if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {
@@ -6448,16 +6429,15 @@ static unsigned long calc_crc_errors(struct tg3 *tp)
        if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) {
-                unsigned long flags;
                u32 val;
-                spin_lock_irqsave(&tp->lock, flags);
+                spin_lock_bh(&tp->lock);
                if (!tg3_readphy(tp, 0x1e, &val)) {
                        tg3_writephy(tp, 0x1e, val | 0x8000);
                        tg3_readphy(tp, 0x14, &val);
                } else
                        val = 0;
-                spin_unlock_irqrestore(&tp->lock, flags);
+                spin_unlock_bh(&tp->lock);
                tp->phy_crc_errors += val;
@@ -6719,11 +6699,9 @@ static void tg3_set_rx_mode(struct net_device *dev)
 {
        struct tg3 *tp = netdev_priv(dev);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        __tg3_set_rx_mode(dev);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
 }
 #define TG3_REGDUMP_LEN         (32 * 1024)
@@ -6745,8 +6723,7 @@ static void tg3_get_regs(struct net_device *dev,
        memset(p, 0, TG3_REGDUMP_LEN);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
 #define __GET_REG32(reg)        (*(p)++ = tr32(reg))
 #define GET_REG32_LOOP(base,len)                \
@@ -6796,8 +6773,7 @@ do {	p = (u32 *)(orig_p + (reg));		\
 #undef GET_REG32_LOOP
 #undef GET_REG32_1
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
 }
 static int tg3_get_eeprom_len(struct net_device *dev)
@@ -6973,8 +6949,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                        return -EINVAL;
        }
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        tp->link_config.autoneg = cmd->autoneg;
        if (cmd->autoneg == AUTONEG_ENABLE) {
@@ -6990,8 +6965,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
        if (netif_running(dev))
                tg3_setup_phy(tp, 1);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
  
        return 0;
 }
@@ -7027,12 +7001,12 @@ static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
            !(tp->tg3_flags & TG3_FLAG_SERDES_WOL_CAP))
                return -EINVAL;
  
-        spin_lock_irq(&tp->lock);
+        spin_lock_bh(&tp->lock);
        if (wol->wolopts & WAKE_MAGIC)
                tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;
        else
                tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE;
-        spin_unlock_irq(&tp->lock);
+        spin_unlock_bh(&tp->lock);
  
        return 0;
 }
@@ -7072,7 +7046,7 @@ static int tg3_nway_reset(struct net_device *dev)
        if (!netif_running(dev))
                return -EAGAIN;
-        spin_lock_irq(&tp->lock);
+        spin_lock_bh(&tp->lock);
        r = -EINVAL;
        tg3_readphy(tp, MII_BMCR, &bmcr);
        if (!tg3_readphy(tp, MII_BMCR, &bmcr) &&
@@ -7080,7 +7054,7 @@ static int tg3_nway_reset(struct net_device *dev)
                tg3_writephy(tp, MII_BMCR, bmcr | BMCR_ANRESTART);
                r = 0;
        }
-        spin_unlock_irq(&tp->lock);
+        spin_unlock_bh(&tp->lock);
  
        return r;
 }
@@ -7102,17 +7076,19 @@ static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam *
 static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
 {
        struct tg3 *tp = netdev_priv(dev);
+        int irq_sync = 0;
  
        if ((ering->rx_pending > TG3_RX_RING_SIZE - 1) ||
            (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) ||
            (ering->tx_pending > TG3_TX_RING_SIZE - 1))
                return -EINVAL;
  
-        if (netif_running(dev))
+        if (netif_running(dev)) {
                tg3_netif_stop(tp);
+                irq_sync = 1;
+        }
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, irq_sync);
-        spin_lock(&tp->tx_lock);
  
        tp->rx_pending = ering->rx_pending;
@@ -7128,8 +7104,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
                tg3_netif_start(tp);
        }
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
  
        return 0;
 }
@@ -7146,12 +7121,15 @@ static void tg3_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam
 static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
 {
        struct tg3 *tp = netdev_priv(dev);
+        int irq_sync = 0;
  
-        if (netif_running(dev))
+        if (netif_running(dev)) {
                tg3_netif_stop(tp);
+                irq_sync = 1;
+        }
+        tg3_full_lock(tp, irq_sync);
-        spin_lock_irq(&tp->lock);
-        spin_lock(&tp->tx_lock);
        if (epause->autoneg)
                tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
        else
@@ -7170,8 +7148,8 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
                tg3_init_hw(tp);
                tg3_netif_start(tp);
        }
-        spin_unlock(&tp->tx_lock);
-        spin_unlock_irq(&tp->lock);
+        tg3_full_unlock(tp);
  
        return 0;
 }
@@ -7192,12 +7170,12 @@ static int tg3_set_rx_csum(struct net_device *dev, u32 data)
                return 0;
        }
  
-        spin_lock_irq(&tp->lock);
+        spin_lock_bh(&tp->lock);
        if (data)
                tp->tg3_flags |= TG3_FLAG_RX_CHECKSUMS;
        else
                tp->tg3_flags &= ~TG3_FLAG_RX_CHECKSUMS;
-        spin_unlock_irq(&tp->lock);
+        spin_unlock_bh(&tp->lock);
  
        return 0;
 }
@@ -7606,8 +7584,6 @@ static int tg3_test_loopback(struct tg3 *tp)
        tg3_abort_hw(tp, 1);
-        /* Clearing this flag to keep interrupts disabled */
-        tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
        tg3_reset_hw(tp);
        mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
@@ -7716,11 +7692,14 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                data[1] = 1;
        }
        if (etest->flags & ETH_TEST_FL_OFFLINE) {
-                if (netif_running(dev))
+                int irq_sync = 0;
+                if (netif_running(dev)) {
                        tg3_netif_stop(tp);
+                        irq_sync = 1;
+                }
-                spin_lock_irq(&tp->lock);
+                tg3_full_lock(tp, irq_sync);
-                spin_lock(&tp->tx_lock);
                tg3_halt(tp, RESET_KIND_SUSPEND, 1);
                tg3_nvram_lock(tp);
@@ -7742,14 +7721,14 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                        data[4] = 1;
                }
-                spin_unlock(&tp->tx_lock);
+                tg3_full_unlock(tp);
-                spin_unlock_irq(&tp->lock);
                if (tg3_test_interrupt(tp) != 0) {
                        etest->flags |= ETH_TEST_FL_FAILED;
                        data[5] = 1;
                }
-                spin_lock_irq(&tp->lock);
-                spin_lock(&tp->tx_lock);
+                tg3_full_lock(tp, 0);
                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
                if (netif_running(dev)) {
@@ -7757,8 +7736,8 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                        tg3_init_hw(tp);
                        tg3_netif_start(tp);
                }
-                spin_unlock(&tp->tx_lock);
-                spin_unlock_irq(&tp->lock);
+                tg3_full_unlock(tp);
        }
 }
@@ -7779,9 +7758,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
                        break;                  /* We have no PHY */
-                spin_lock_irq(&tp->lock);
+                spin_lock_bh(&tp->lock);
                err = tg3_readphy(tp, data->reg_num & 0x1f, &mii_regval);
-                spin_unlock_irq(&tp->lock);
+                spin_unlock_bh(&tp->lock);
                data->val_out = mii_regval;
@@ -7795,9 +7774,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
-                spin_lock_irq(&tp->lock);
+                spin_lock_bh(&tp->lock);
                err = tg3_writephy(tp, data->reg_num & 0x1f, data->val_in);
-                spin_unlock_irq(&tp->lock);
+                spin_unlock_bh(&tp->lock);
                return err;
@@ -7813,28 +7792,24 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 {
        struct tg3 *tp = netdev_priv(dev);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        tp->vlgrp = grp;
        /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */
        __tg3_set_rx_mode(dev);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
 }
 static void tg3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 {
        struct tg3 *tp = netdev_priv(dev);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        if (tp->vlgrp)
                tp->vlgrp->vlan_devices[vid] = NULL;
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
 }
 #endif
@@ -10165,24 +10140,19 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
        del_timer_sync(&tp->timer);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 1);
-        spin_lock(&tp->tx_lock);
        tg3_disable_ints(tp);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        netif_device_detach(dev);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        err = tg3_set_power_state(tp, pci_choose_state(pdev, state));
        if (err) {
-                spin_lock_irq(&tp->lock);
+                tg3_full_lock(tp, 0);
-                spin_lock(&tp->tx_lock);
                tg3_init_hw(tp);
@@ -10192,8 +10162,7 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
                netif_device_attach(dev);
                tg3_netif_start(tp);
-                spin_unlock(&tp->tx_lock);
+                tg3_full_unlock(tp);
-                spin_unlock_irq(&tp->lock);
        }
        return err;
@@ -10216,20 +10185,16 @@ static int tg3_resume(struct pci_dev *pdev)
        netif_device_attach(dev);
-        spin_lock_irq(&tp->lock);
+        tg3_full_lock(tp, 0);
-        spin_lock(&tp->tx_lock);
        tg3_init_hw(tp);
        tp->timer.expires = jiffies + tp->timer_offset;
        add_timer(&tp->timer);
-        tg3_enable_ints(tp);
        tg3_netif_start(tp);
-        spin_unlock(&tp->tx_lock);
+        tg3_full_unlock(tp);
-        spin_unlock_irq(&tp->lock);
        return 0;
 }
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 993f84c93dc4..99c5f9675a56 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2006,17 +2006,31 @@ struct tg3_ethtool_stats {
 struct tg3 {
        /* begin "general, frequently-used members" cacheline section */
+        /* If the IRQ handler (which runs lockless) needs to be
+         * quiesced, the following bitmask state is used.  The
+         * SYNC flag is set by non-IRQ context code to initiate
+         * the quiescence.
+         *
+         * When the IRQ handler notices that SYNC is set, it
+         * disables interrupts and returns.
+         *
+         * When all outstanding IRQ handlers have returned after
+         * the SYNC flag has been set, the setter can be assured
+         * that interrupts will no longer get run.
+         *
+         * In this way all SMP driver locks are never acquired
+         * in hw IRQ context, only sw IRQ context or lower.
+         */
+        unsigned int                    irq_sync;
        /* SMP locking strategy:
         *
         * lock: Held during all operations except TX packet
         *       processing.
         *
-         * tx_lock: Held during tg3_start_xmit{,_4gbug} and tg3_tx
+         * tx_lock: Held during tg3_start_xmit and tg3_tx
         *
-         * If you want to shut up all asynchronous processing you must
+         * Both of these locks are to be held with BH safety.
-         * acquire both locks, 'lock' taken before 'tx_lock'.  IRQs must
-         * be disabled to take 'lock' but only softirq disabling is
-         * necessary for acquisition of 'tx_lock'.
         */
        spinlock_t                      lock;
        spinlock_t                      indirect_lock;
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 66b94668ddd8..18c27e1e7884 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -435,7 +435,7 @@ config VENDOR_SANGOMA
          the driver to support.
          If you have one or more of these cards, say M to this option;
-          and read <file:Documentation/networking/wanpipe.txt>.
+          and read <file:Documentation/networking/wan-router.txt>.
          To compile this driver as a module, choose M here: the
          module will be called wanpipe.
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index fb10a2db63ad..d72e0385e4f2 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2918,7 +2918,7 @@ static int airo_thread(void *data) {
                        flush_signals(current);
                /* make swsusp happy with our thread */
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
                if (test_bit(JOB_DIE, &ai->flags))
                        break;
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index d136b3c8fac9..48e4f04530d8 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -718,7 +718,7 @@ static int pccardd(void *__skt)
                }
                schedule();
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
                if (!skt->thread)
                        break;
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index e939c93a931c..778a324028f4 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -182,7 +182,7 @@ static int pnp_dock_thread(void * unused)
                msleep_interruptible(2000);
                if(signal_pending(current)) {
-                        if (try_to_freeze(PF_FREEZE))
+                        if (try_to_freeze())
                                continue;
                        break;
                }
diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index 96413c2cd1ad..a86a650f3d6d 100644
--- a/drivers/s390/Kconfig
+++ b/drivers/s390/Kconfig
@@ -187,6 +187,13 @@ config VMLOGRDR
          *SYMPTOM.
          This driver depends on the IUCV support driver.
+config VMCP
+        tristate "Support for the z/VM CP interface (VM only)"
+        help
+          Select this option if you want to be able to interact with the control
+          program on z/VM
 config MONREADER
        tristate "API for reading z/VM monitor service records"
        depends on IUCV
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index ceeb3cf64a16..6527ff6f4706 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -176,7 +176,7 @@ dasd_state_known_to_basic(struct dasd_device * device)
                return rc;
        /* register 'device' debug area, used for all DBF_DEV_XXX calls */
-        device->debug_area = debug_register(device->cdev->dev.bus_id, 0, 2,
+        device->debug_area = debug_register(device->cdev->dev.bus_id, 1, 2,
                                            8 * sizeof (long));
        debug_register_view(device->debug_area, &debug_sprintf_view);
        debug_set_level(device->debug_area, DBF_EMERG);
@@ -1952,26 +1952,24 @@ dasd_generic_notify(struct ccw_device *cdev, int event)
 * Automatically online either all dasd devices (dasd_autodetect) or
 * all devices specified with dasd= parameters.
 */
+static int
+__dasd_auto_online(struct device *dev, void *data)
+{
+        struct ccw_device *cdev;
+        cdev = to_ccwdev(dev);
+        if (dasd_autodetect || dasd_busid_known(cdev->dev.bus_id) == 0)
+                ccw_device_set_online(cdev);
+        return 0;
+}
 void
 dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver)
 {
        struct device_driver *drv;
-        struct device *d, *dev;
-        struct ccw_device *cdev;
        drv = get_driver(&dasd_discipline_driver->driver);
-        down_read(&drv->bus->subsys.rwsem);
+        driver_for_each_device(drv, NULL, NULL, __dasd_auto_online);
-        dev = NULL;
-        list_for_each_entry(d, &drv->devices, driver_list) {
-                dev = get_device(d);
-                if (!dev)
-                        continue;
-                cdev = to_ccwdev(dev);
-                if (dasd_autodetect || dasd_busid_known(cdev->dev.bus_id) == 0)
-                        ccw_device_set_online(cdev);
-                put_device(dev);
-        }
-        up_read(&drv->bus->subsys.rwsem);
        put_driver(drv);
 }
@@ -1983,7 +1981,7 @@ dasd_init(void)
        init_waitqueue_head(&dasd_init_waitq);
        /* register 'common' DASD debug area, used for all DBF_XXX calls */
-        dasd_debug_area = debug_register("dasd", 0, 2, 8 * sizeof (long));
+        dasd_debug_area = debug_register("dasd", 1, 2, 8 * sizeof (long));
        if (dasd_debug_area == NULL) {
                rc = -ENOMEM;
                goto failed;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index d7f19745911f..43c34f8c5e68 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -9,13 +9,14 @@
 *
 * /proc interface for the dasd driver.
 *
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
 */
 #include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
+#include <linux/proc_fs.h>
 #include <asm/debug.h>
 #include <asm/uaccess.h>
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 6bc27d52326f..4fde41188996 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -718,7 +718,7 @@ dcssblk_check_params(void)
                        buf[j-i] = dcssblk_segments[j];
                }
                buf[j-i] = '\0';
-                rc = dcssblk_add_store(dcssblk_root_dev, buf, j-i);
+                rc = dcssblk_add_store(dcssblk_root_dev, NULL, buf, j-i);
                if ((rc >= 0) && (dcssblk_segments[j] == '(')) {
                        for (k = 0; buf[k] != '\0'; k++)
                                buf[k] = toupper(buf[k]);
@@ -728,7 +728,7 @@ dcssblk_check_params(void)
                                up_read(&dcssblk_devices_sem);
                                if (dev_info)
                                        dcssblk_shared_store(&dev_info->dev,
-                                                             "0\n", 2);
+                                                             NULL, "0\n", 2);
                        }
                }
                while ((dcssblk_segments[j] != ',') &&
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 14e8cce9f862..6377a96735df 100644
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
 obj-$(CONFIG_ZVM_WATCHDOG) += vmwatchdog.o
 obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o
+obj-$(CONFIG_VMCP) += vmcp.o
 tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o
 tape-$(CONFIG_PROC_FS) += tape_proc.o
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 022f17bff731..f11a67fda40e 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -860,8 +860,8 @@ con3215_init(void)
        /* Set the console mode for VM */
        if (MACHINE_IS_VM) {
-                cpcmd("TERM CONMODE 3215", NULL, 0);
+                cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
-                cpcmd("TERM AUTOCR OFF", NULL, 0);
+                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
        }
        /* allocate 3215 request structures */
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index d52fb57a6b19..fc7a213e591f 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -591,8 +591,8 @@ con3270_init(void)
        /* Set the console mode for VM */
        if (MACHINE_IS_VM) {
-                cpcmd("TERM CONMODE 3270", 0, 0);
+                cpcmd("TERM CONMODE 3270", NULL, 0, NULL);
-                cpcmd("TERM AUTOCR OFF", 0, 0);
+                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
        }
        cdev = ccw_device_probe_console();
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 480ec87976fb..20be88e91fa1 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -1351,13 +1351,13 @@ tape_34xx_init (void)
 {
        int rc;
-        TAPE_DBF_AREA = debug_register ( "tape_34xx", 1, 2, 4*sizeof(long));
+        TAPE_DBF_AREA = debug_register ( "tape_34xx", 2, 2, 4*sizeof(long));
        debug_register_view(TAPE_DBF_AREA, &debug_sprintf_view);
 #ifdef DBF_LIKE_HELL
        debug_set_level(TAPE_DBF_AREA, 6);
 #endif
-        DBF_EVENT(3, "34xx init: $Revision: 1.21 $\n");
+        DBF_EVENT(3, "34xx init: $Revision: 1.23 $\n");
        /* Register driver for 3480/3490 tapes. */
        rc = ccw_driver_register(&tape_34xx_driver);
        if (rc)
@@ -1378,7 +1378,7 @@ tape_34xx_exit(void)
 MODULE_DEVICE_TABLE(ccw, tape_34xx_ids);
 MODULE_AUTHOR("(C) 2001-2002 IBM Deutschland Entwicklung GmbH");
 MODULE_DESCRIPTION("Linux on zSeries channel attached 3480 tape "
-                   "device driver ($Revision: 1.21 $)");
+                   "device driver ($Revision: 1.23 $)");
 MODULE_LICENSE("GPL");
 module_init(tape_34xx_init);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index b4df4a515b12..0597aa0e27ee 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -1186,7 +1186,7 @@ tape_mtop(struct tape_device *device, int mt_op, int mt_count)
 static int
 tape_init (void)
 {
-        TAPE_DBF_AREA = debug_register ( "tape", 1, 2, 4*sizeof(long));
+        TAPE_DBF_AREA = debug_register ( "tape", 2, 2, 4*sizeof(long));
        debug_register_view(TAPE_DBF_AREA, &debug_sprintf_view);
 #ifdef DBF_LIKE_HELL
        debug_set_level(TAPE_DBF_AREA, 6);
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index 801d17cca34e..5fec0a10cc3d 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/seq_file.h>
+#include <linux/proc_fs.h>
 #define TAPE_DBF_AREA   tape_core_dbf
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
new file mode 100644
index 000000000000..7f11a608a633
--- /dev/null
+++ b/drivers/s390/char/vmcp.c
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2004,2005 IBM Corporation
+ * Interface implementation for communication with the v/VM control program
+ * Author(s): Christian Borntraeger <cborntra@de.ibm.com>
+ *
+ *
+ * z/VMs CP offers the possibility to issue commands via the diagnose code 8
+ * this driver implements a character device that issues these commands and
+ * returns the answer of CP.
+ * The idea of this driver is based on cpint from Neale Ferguson and #CP in CMS
+ */
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <asm/cpcmd.h>
+#include <asm/debug.h>
+#include <asm/uaccess.h>
+#include "vmcp.h"
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Borntraeger <cborntra@de.ibm.com>");
+MODULE_DESCRIPTION("z/VM CP interface");
+static debug_info_t *vmcp_debug;
+static int vmcp_open(struct inode *inode, struct file *file)
+{
+        struct vmcp_session *session;
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+        session = kmalloc(sizeof(*session), GFP_KERNEL);
+        if (!session)
+                return -ENOMEM;
+        session->bufsize = PAGE_SIZE;
+        session->response = NULL;
+        session->resp_size = 0;
+        init_MUTEX(&session->mutex);
+        file->private_data = session;
+        return nonseekable_open(inode, file);
+}
+static int vmcp_release(struct inode *inode, struct file *file)
+{
+        struct vmcp_session *session;
+        session = (struct vmcp_session *)file->private_data;
+        file->private_data = NULL;
+        free_pages((unsigned long)session->response, get_order(session->bufsize));
+        kfree(session);
+        return 0;
+}
+static ssize_t
+vmcp_read(struct file *file, char __user * buff, size_t count, loff_t * ppos)
+{
+        size_t tocopy;
+        struct vmcp_session *session;
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        if (!session->response) {
+                up(&session->mutex);
+                return 0;
+        }
+        if (*ppos > session->resp_size) {
+                up(&session->mutex);
+                return 0;
+        }
+        tocopy = min(session->resp_size - (size_t) (*ppos), count);
+        tocopy = min(tocopy,session->bufsize - (size_t) (*ppos));
+        if (copy_to_user(buff, session->response + (*ppos), tocopy)) {
+                up(&session->mutex);
+                return -EFAULT;
+        }
+        up(&session->mutex);
+        *ppos += tocopy;
+        return tocopy;
+}
+static ssize_t
+vmcp_write(struct file *file, const char __user * buff, size_t count,
+           loff_t * ppos)
+{
+        char *cmd;
+        struct vmcp_session *session;
+        if (count > 240)
+                return -EINVAL;
+        cmd = kmalloc(count + 1, GFP_KERNEL);
+        if (!cmd)
+                return -ENOMEM;
+        if (copy_from_user(cmd, buff, count)) {
+                kfree(cmd);
+                return -EFAULT;
+        }
+        cmd[count] = '\0';
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        if (!session->response)
+                session->response = (char *)__get_free_pages(GFP_KERNEL
+                                                | __GFP_REPEAT  | GFP_DMA,
+                                                get_order(session->bufsize));
+        if (!session->response) {
+                up(&session->mutex);
+                kfree(cmd);
+                return -ENOMEM;
+        }
+        debug_text_event(vmcp_debug, 1, cmd);
+        session->resp_size = cpcmd(cmd, session->response,
+                                   session->bufsize,
+                                   &session->resp_code);
+        up(&session->mutex);
+        kfree(cmd);
+        *ppos = 0;              /* reset the file pointer after a command */
+        return count;
+}
+/*
+ * These ioctls are available, as the semantics of the diagnose 8 call
+ * does not fit very well into a Linux call. Diagnose X'08' is described in
+ * CP Programming Services SC24-6084-00
+ *
+ * VMCP_GETCODE: gives the CP return code back to user space
+ * VMCP_SETBUF: sets the response buffer for the next write call. diagnose 8
+ * expects adjacent pages in real storage and to make matters worse, we
+ * dont know the size of the response. Therefore we default to PAGESIZE and
+ * let userspace to change the response size, if userspace expects a bigger
+ * response
+ */
+static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct vmcp_session *session;
+        int temp;
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        switch (cmd) {
+        case VMCP_GETCODE:
+                temp = session->resp_code;
+                up(&session->mutex);
+                return put_user(temp, (int __user *)arg);
+        case VMCP_SETBUF:
+                free_pages((unsigned long)session->response,
+                                get_order(session->bufsize));
+                session->response=NULL;
+                temp = get_user(session->bufsize, (int __user *)arg);
+                if (get_order(session->bufsize) > 8) {
+                        session->bufsize = PAGE_SIZE;
+                        temp = -EINVAL;
+                }
+                up(&session->mutex);
+                return temp;
+        case VMCP_GETSIZE:
+                temp = session->resp_size;
+                up(&session->mutex);
+                return put_user(temp, (int __user *)arg);
+        default:
+                up(&session->mutex);
+                return -ENOIOCTLCMD;
+        }
+}
+static struct file_operations vmcp_fops = {
+        .owner          = THIS_MODULE,
+        .open           = &vmcp_open,
+        .release        = &vmcp_release,
+        .read           = &vmcp_read,
+        .llseek         = &no_llseek,
+        .write          = &vmcp_write,
+        .unlocked_ioctl = &vmcp_ioctl,
+        .compat_ioctl   = &vmcp_ioctl
+};
+static struct miscdevice vmcp_dev = {
+        .name   = "vmcp",
+        .minor  = MISC_DYNAMIC_MINOR,
+        .fops   = &vmcp_fops,
+};
+static int __init vmcp_init(void)
+{
+        int ret;
+        if (!MACHINE_IS_VM) {
+                printk(KERN_WARNING
+                       "z/VM CP interface is only available under z/VM\n");
+                return -ENODEV;
+        }
+        ret = misc_register(&vmcp_dev);
+        if (!ret)
+                printk(KERN_INFO "z/VM CP interface loaded\n");
+        else
+                printk(KERN_WARNING
+                       "z/VM CP interface not loaded. Could not register misc device.\n");
+        vmcp_debug = debug_register("vmcp", 1, 1, 240);
+        debug_register_view(vmcp_debug, &debug_hex_ascii_view);
+        return ret;
+}
+static void __exit vmcp_exit(void)
+{
+        WARN_ON(misc_deregister(&vmcp_dev) != 0);
+        debug_unregister(vmcp_debug);
+        printk(KERN_INFO "z/VM CP interface unloaded.\n");
+}
+module_init(vmcp_init);
+module_exit(vmcp_exit);
diff --git a/drivers/s390/char/vmcp.h b/drivers/s390/char/vmcp.h
new file mode 100644
index 000000000000..87389e730465
--- /dev/null
+++ b/drivers/s390/char/vmcp.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2004, 2005 IBM Corporation
+ * Interface implementation for communication with the v/VM control program
+ * Version 1.0
+ * Author(s): Christian Borntraeger <cborntra@de.ibm.com>
+ *
+ *
+ * z/VMs CP offers the possibility to issue commands via the diagnose code 8
+ * this driver implements a character device that issues these commands and
+ * returns the answer of CP.
+ *
+ * The idea of this driver is based on cpint from Neale Ferguson
+ */
+#include <asm/semaphore.h>
+#include <linux/ioctl.h>
+#define VMCP_GETCODE _IOR(0x10, 1, int)
+#define VMCP_SETBUF _IOW(0x10, 2, int)
+#define VMCP_GETSIZE _IOR(0x10, 3, int)
+struct vmcp_session {
+        unsigned int bufsize;
+        char *response;
+        int resp_size;
+        int resp_code;
+        /* As we use copy_from/to_user, which might     *
+         * sleep and cannot use a spinlock              */
+        struct semaphore mutex;
+};
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index f7717327d15e..491f00c032e8 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -236,7 +236,7 @@ vmlogrdr_get_recording_class_AB(void) {
        int len,i;
        printk (KERN_DEBUG "vmlogrdr: query command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
        printk (KERN_DEBUG "vmlogrdr: response: %s", cp_response);
        len = strnlen(cp_response,sizeof(cp_response));
        // now the parsing
@@ -288,7 +288,7 @@ vmlogrdr_recording(struct vmlogrdr_priv_t * logptr, int action, int purge) {
                printk (KERN_DEBUG "vmlogrdr: recording command: %s\n",
                        cp_command);
-                cpcmd(cp_command, cp_response, sizeof(cp_response));
+                cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
                printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                        cp_response);
        }
@@ -301,7 +301,7 @@ vmlogrdr_recording(struct vmlogrdr_priv_t * logptr, int action, int purge) {
                qid_string);
        printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
        printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                cp_response);
        /* The recording command will usually answer with 'Command complete'
@@ -607,7 +607,7 @@ vmlogrdr_purge_store(struct device * dev, struct device_attribute *attr, const c
                         priv->recording_name);
        printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
        printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                cp_response);
@@ -682,7 +682,7 @@ vmlogrdr_recording_status_show(struct device_driver *driver, char *buf) {
        char cp_command[] = "QUERY RECORDING ";
        int len;
-        cpcmd(cp_command, buf, 4096);
+        cpcmd(cp_command, buf, 4096, NULL);
        len = strlen(buf);
        return len;
 }
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 306525acb9f8..91ea8e4777f3 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -403,34 +403,22 @@ ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
        return driver_register(&cdriver->driver);
 }
-static inline struct device *
+static int
-__get_next_ccwgroup_device(struct device_driver *drv)
+__ccwgroup_driver_unregister_device(struct device *dev, void *data)
 {
-        struct device *dev, *d;
+        __ccwgroup_remove_symlinks(to_ccwgroupdev(dev));
+        device_unregister(dev);
-        down_read(&drv->bus->subsys.rwsem);
+        put_device(dev);
-        dev = NULL;
+        return 0;
-        list_for_each_entry(d, &drv->devices, driver_list) {
-                dev = get_device(d);
-                if (dev)
-                        break;
-        }
-        up_read(&drv->bus->subsys.rwsem);
-        return dev;
 }
 void
 ccwgroup_driver_unregister (struct ccwgroup_driver *cdriver)
 {
-        struct device *dev;
        /* We don't want ccwgroup devices to live longer than their driver. */
        get_driver(&cdriver->driver);
-        while ((dev = __get_next_ccwgroup_device(&cdriver->driver))) {
+        driver_for_each_device(&cdriver->driver, NULL, NULL,
-                __ccwgroup_remove_symlinks(to_ccwgroupdev(dev));
+                               __ccwgroup_driver_unregister_device);
-                device_unregister(dev);
-                put_device(dev);
-        };
        put_driver(&cdriver->driver);
        driver_unregister(&cdriver->driver);
 }
@@ -449,7 +437,7 @@ __ccwgroup_get_gdev_by_cdev(struct ccw_device *cdev)
        if (cdev->dev.driver_data) {
                gdev = (struct ccwgroup_device *)cdev->dev.driver_data;
                if (get_device(&gdev->dev)) {
-                        if (!list_empty(&gdev->dev.node))
+                        if (klist_node_attached(&gdev->dev.knode_bus))
                                return gdev;
                        put_device(&gdev->dev);
                }
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 1d9b3f18d8de..ea813bdce1d6 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,7 @@
 /*
 *  drivers/s390/cio/cio.c
 *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.133 $
+ *   $Revision: 1.134 $
 *
 *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
 *                            IBM Corporation
@@ -63,17 +63,17 @@ __setup ("cio_msg=", cio_setup);
 static int __init
 cio_debug_init (void)
 {
-        cio_debug_msg_id = debug_register ("cio_msg", 4, 4, 16*sizeof (long));
+        cio_debug_msg_id = debug_register ("cio_msg", 16, 4, 16*sizeof (long));
        if (!cio_debug_msg_id)
                goto out_unregister;
        debug_register_view (cio_debug_msg_id, &debug_sprintf_view);
        debug_set_level (cio_debug_msg_id, 2);
-        cio_debug_trace_id = debug_register ("cio_trace", 4, 4, 8);
+        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 8);
        if (!cio_debug_trace_id)
                goto out_unregister;
        debug_register_view (cio_debug_trace_id, &debug_hex_ascii_view);
        debug_set_level (cio_debug_trace_id, 2);
-        cio_debug_crw_id = debug_register ("cio_crw", 2, 4, 16*sizeof (long));
+        cio_debug_crw_id = debug_register ("cio_crw", 4, 4, 16*sizeof (long));
        if (!cio_debug_crw_id)
                goto out_unregister;
        debug_register_view (cio_debug_crw_id, &debug_sprintf_view);
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 87bd70eeabed..555119cacc27 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -128,34 +128,28 @@ css_probe_device(int irq)
        return ret;
 }
+static int
+check_subchannel(struct device * dev, void * data)
+{
+        struct subchannel *sch;
+        int irq = (unsigned long)data;
+        sch = to_subchannel(dev);
+        return (sch->irq == irq);
+}
 struct subchannel *
 get_subchannel_by_schid(int irq)
 {
-        struct subchannel *sch;
-        struct list_head *entry;
        struct device *dev;
-        if (!get_bus(&css_bus_type))
+        dev = bus_find_device(&css_bus_type, NULL,
-                return NULL;
+                              (void *)(unsigned long)irq, check_subchannel);
-        down_read(&css_bus_type.subsys.rwsem);
-        sch = NULL;
-        list_for_each(entry, &css_bus_type.devices.list) {
-                dev = get_device(container_of(entry,
-                                              struct device, bus_list));
-                if (!dev)
-                        continue;
-                sch = to_subchannel(dev);
-                if (sch->irq == irq)
-                        break;
-                put_device(dev);
-                sch = NULL;
-        }
-        up_read(&css_bus_type.subsys.rwsem);
-        put_bus(&css_bus_type);
-        return sch;
+        return dev ? to_subchannel(dev) : NULL;
 }
 static inline int
 css_get_subchannel_status(struct subchannel *sch, int schid)
 {
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 809e1108a06e..14c76f5e4177 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -514,36 +514,39 @@ ccw_device_register(struct ccw_device *cdev)
        return ret;
 }
+struct match_data {
+        unsigned int  devno;
+        struct ccw_device * sibling;
+};
+static int
+match_devno(struct device * dev, void * data)
+{
+        struct match_data * d = (struct match_data *)data;
+        struct ccw_device * cdev;
+        cdev = to_ccwdev(dev);
+        if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&
+            (cdev->private->devno == d->devno) &&
+            (cdev != d->sibling)) {
+                cdev->private->state = DEV_STATE_NOT_OPER;
+                return 1;
+        }
+        return 0;
+}
 static struct ccw_device *
 get_disc_ccwdev_by_devno(unsigned int devno, struct ccw_device *sibling)
 {
-        struct ccw_device *cdev;
-        struct list_head *entry;
        struct device *dev;
+        struct match_data data = {
+                .devno  = devno,
+                .sibling = sibling,
+        };
-        if (!get_bus(&ccw_bus_type))
+        dev = bus_find_device(&css_bus_type, NULL, &data, match_devno);
-                return NULL;
-        down_read(&ccw_bus_type.subsys.rwsem);
-        cdev = NULL;
-        list_for_each(entry, &ccw_bus_type.devices.list) {
-                dev = get_device(container_of(entry,
-                                              struct device, bus_list));
-                if (!dev)
-                        continue;
-                cdev = to_ccwdev(dev);
-                if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&
-                    (cdev->private->devno == devno) &&
-                    (cdev != sibling)) {
-                        cdev->private->state = DEV_STATE_NOT_OPER;
-                        break;
-                }
-                put_device(dev);
-                cdev = NULL;
-        }
-        up_read(&ccw_bus_type.subsys.rwsem);
-        put_bus(&ccw_bus_type);
-        return cdev;
+        return dev ? to_ccwdev(dev) : NULL;
 }
 static void
@@ -647,7 +650,7 @@ io_subchannel_register(void *data)
        cdev = (struct ccw_device *) data;
        sch = to_subchannel(cdev->dev.parent);
-        if (!list_empty(&sch->dev.children)) {
+        if (klist_node_attached(&cdev->dev.knode_parent)) {
                bus_rescan_devices(&ccw_bus_type);
                goto out;
        }
@@ -1019,30 +1022,29 @@ ccw_device_probe_console(void)
 /*
 * get ccw_device matching the busid, but only if owned by cdrv
 */
+static int
+__ccwdev_check_busid(struct device *dev, void *id)
+{
+        char *bus_id;
+        bus_id = (char *)id;
+        return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0);
+}
 struct ccw_device *
 get_ccwdev_by_busid(struct ccw_driver *cdrv, const char *bus_id)
 {
-        struct device *d, *dev;
+        struct device *dev;
        struct device_driver *drv;
        drv = get_driver(&cdrv->driver);
        if (!drv)
-                return 0;
+                return NULL;
-        down_read(&drv->bus->subsys.rwsem);
-        dev = NULL;
-        list_for_each_entry(d, &drv->devices, driver_list) {
-                dev = get_device(d);
-                if (dev && !strncmp(bus_id, dev->bus_id, BUS_ID_SIZE))
+        dev = driver_find_device(drv, NULL, (void *)bus_id,
-                        break;
+                                 __ccwdev_check_busid);
-                else if (dev) {
-                        put_device(dev);
-                        dev = NULL;
-                }
-        }
-        up_read(&drv->bus->subsys.rwsem);
        put_driver(drv);
        return dev ? to_ccwdev(dev) : 0;
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index bbe9f45d1438..82194c4eadfb 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -56,7 +56,7 @@
 #include "ioasm.h"
 #include "chsc.h"
-#define VERSION_QDIO_C "$Revision: 1.98 $"
+#define VERSION_QDIO_C "$Revision: 1.101 $"
 /****************** MODULE PARAMETER VARIABLES ********************/
 MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
@@ -3342,7 +3342,7 @@ static int
 qdio_register_dbf_views(void)
 {
        qdio_dbf_setup=debug_register(QDIO_DBF_SETUP_NAME,
-                                      QDIO_DBF_SETUP_INDEX,
+                                      QDIO_DBF_SETUP_PAGES,
                                      QDIO_DBF_SETUP_NR_AREAS,
                                      QDIO_DBF_SETUP_LEN);
        if (!qdio_dbf_setup)
@@ -3351,7 +3351,7 @@ qdio_register_dbf_views(void)
        debug_set_level(qdio_dbf_setup,QDIO_DBF_SETUP_LEVEL);
        qdio_dbf_sbal=debug_register(QDIO_DBF_SBAL_NAME,
-                                     QDIO_DBF_SBAL_INDEX,
+                                     QDIO_DBF_SBAL_PAGES,
                                     QDIO_DBF_SBAL_NR_AREAS,
                                     QDIO_DBF_SBAL_LEN);
        if (!qdio_dbf_sbal)
@@ -3361,7 +3361,7 @@ qdio_register_dbf_views(void)
        debug_set_level(qdio_dbf_sbal,QDIO_DBF_SBAL_LEVEL);
        qdio_dbf_sense=debug_register(QDIO_DBF_SENSE_NAME,
-                                      QDIO_DBF_SENSE_INDEX,
+                                      QDIO_DBF_SENSE_PAGES,
                                      QDIO_DBF_SENSE_NR_AREAS,
                                      QDIO_DBF_SENSE_LEN);
        if (!qdio_dbf_sense)
@@ -3371,7 +3371,7 @@ qdio_register_dbf_views(void)
        debug_set_level(qdio_dbf_sense,QDIO_DBF_SENSE_LEVEL);
        qdio_dbf_trace=debug_register(QDIO_DBF_TRACE_NAME,
-                                      QDIO_DBF_TRACE_INDEX,
+                                      QDIO_DBF_TRACE_PAGES,
                                      QDIO_DBF_TRACE_NR_AREAS,
                                      QDIO_DBF_TRACE_LEN);
        if (!qdio_dbf_trace)
@@ -3382,7 +3382,7 @@ qdio_register_dbf_views(void)
 #ifdef CONFIG_QDIO_DEBUG
        qdio_dbf_slsb_out=debug_register(QDIO_DBF_SLSB_OUT_NAME,
-                                         QDIO_DBF_SLSB_OUT_INDEX,
+                                         QDIO_DBF_SLSB_OUT_PAGES,
                                         QDIO_DBF_SLSB_OUT_NR_AREAS,
                                         QDIO_DBF_SLSB_OUT_LEN);
        if (!qdio_dbf_slsb_out)
@@ -3391,7 +3391,7 @@ qdio_register_dbf_views(void)
        debug_set_level(qdio_dbf_slsb_out,QDIO_DBF_SLSB_OUT_LEVEL);
        qdio_dbf_slsb_in=debug_register(QDIO_DBF_SLSB_IN_NAME,
-                                        QDIO_DBF_SLSB_IN_INDEX,
+                                        QDIO_DBF_SLSB_IN_PAGES,
                                        QDIO_DBF_SLSB_IN_NR_AREAS,
                                        QDIO_DBF_SLSB_IN_LEN);
        if (!qdio_dbf_slsb_in)
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index b6daadac4e8b..6b8aa6a852be 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -3,7 +3,7 @@
 #include <asm/page.h>
-#define VERSION_CIO_QDIO_H "$Revision: 1.32 $"
+#define VERSION_CIO_QDIO_H "$Revision: 1.33 $"
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_VERBOSE_LEVEL 9
@@ -132,7 +132,7 @@ enum qdio_irq_states {
 #define QDIO_DBF_SETUP_NAME "qdio_setup"
 #define QDIO_DBF_SETUP_LEN 8
-#define QDIO_DBF_SETUP_INDEX 2
+#define QDIO_DBF_SETUP_PAGES 4
 #define QDIO_DBF_SETUP_NR_AREAS 1
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_DBF_SETUP_LEVEL 6
@@ -142,7 +142,7 @@ enum qdio_irq_states {
 #define QDIO_DBF_SBAL_NAME "qdio_labs" /* sbal */
 #define QDIO_DBF_SBAL_LEN 256
-#define QDIO_DBF_SBAL_INDEX 2
+#define QDIO_DBF_SBAL_PAGES 4
 #define QDIO_DBF_SBAL_NR_AREAS 2
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_DBF_SBAL_LEVEL 6
@@ -154,16 +154,16 @@ enum qdio_irq_states {
 #define QDIO_DBF_TRACE_LEN 8
 #define QDIO_DBF_TRACE_NR_AREAS 2
 #ifdef CONFIG_QDIO_DEBUG
-#define QDIO_DBF_TRACE_INDEX 4
+#define QDIO_DBF_TRACE_PAGES 16
 #define QDIO_DBF_TRACE_LEVEL 4 /* -------- could be even more verbose here */
 #else /* CONFIG_QDIO_DEBUG */
-#define QDIO_DBF_TRACE_INDEX 2
+#define QDIO_DBF_TRACE_PAGES 4
 #define QDIO_DBF_TRACE_LEVEL 2
 #endif /* CONFIG_QDIO_DEBUG */
 #define QDIO_DBF_SENSE_NAME "qdio_sense"
 #define QDIO_DBF_SENSE_LEN 64
-#define QDIO_DBF_SENSE_INDEX 1
+#define QDIO_DBF_SENSE_PAGES 2
 #define QDIO_DBF_SENSE_NR_AREAS 1
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_DBF_SENSE_LEVEL 6
@@ -176,13 +176,13 @@ enum qdio_irq_states {
 #define QDIO_DBF_SLSB_OUT_NAME "qdio_slsb_out"
 #define QDIO_DBF_SLSB_OUT_LEN QDIO_MAX_BUFFERS_PER_Q
-#define QDIO_DBF_SLSB_OUT_INDEX 8
+#define QDIO_DBF_SLSB_OUT_PAGES 256
 #define QDIO_DBF_SLSB_OUT_NR_AREAS 1
 #define QDIO_DBF_SLSB_OUT_LEVEL 6
 #define QDIO_DBF_SLSB_IN_NAME "qdio_slsb_in"
 #define QDIO_DBF_SLSB_IN_LEN QDIO_MAX_BUFFERS_PER_Q
-#define QDIO_DBF_SLSB_IN_INDEX 8
+#define QDIO_DBF_SLSB_IN_PAGES 256
 #define QDIO_DBF_SLSB_IN_NR_AREAS 1
 #define QDIO_DBF_SLSB_IN_LEVEL 6
 #endif /* CONFIG_QDIO_DEBUG */
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index a99927d54ebb..60440dbe3a27 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -146,8 +146,8 @@ claw_unregister_debug_facility(void)
 static int
 claw_register_debug_facility(void)
 {
-        claw_dbf_setup = debug_register("claw_setup", 1, 1, 8);
+        claw_dbf_setup = debug_register("claw_setup", 2, 1, 8);
-        claw_dbf_trace = debug_register("claw_trace", 1, 2, 8);
+        claw_dbf_trace = debug_register("claw_trace", 2, 2, 8);
        if (claw_dbf_setup == NULL || claw_dbf_trace == NULL) {
                printk(KERN_WARNING "Not enough memory for debug facility.\n");
                claw_unregister_debug_facility();
diff --git a/drivers/s390/net/ctcdbug.c b/drivers/s390/net/ctcdbug.c
index 2c86bfa11b2f..0e2a8bb93032 100644
--- a/drivers/s390/net/ctcdbug.c
+++ b/drivers/s390/net/ctcdbug.c
@@ -1,6 +1,6 @@
 /*
 *
- * linux/drivers/s390/net/ctcdbug.c ($Revision: 1.4 $)
+ * linux/drivers/s390/net/ctcdbug.c ($Revision: 1.6 $)
 *
 * CTC / ESCON network driver - s390 dbf exploit.
 *
@@ -9,7 +9,7 @@
 *    Author(s): Original Code written by
 *                        Peter Tiedemann (ptiedem@de.ibm.com)
 *
- *    $Revision: 1.4 $   $Date: 2004/08/04 10:11:59 $
+ *    $Revision: 1.6 $   $Date: 2005/05/11 08:10:17 $
 *
 * 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
@@ -51,15 +51,15 @@ int
 ctc_register_dbf_views(void)
 {
        ctc_dbf_setup = debug_register(CTC_DBF_SETUP_NAME,
-                                        CTC_DBF_SETUP_INDEX,
+                                        CTC_DBF_SETUP_PAGES,
                                        CTC_DBF_SETUP_NR_AREAS,
                                        CTC_DBF_SETUP_LEN);
        ctc_dbf_data = debug_register(CTC_DBF_DATA_NAME,
-                                       CTC_DBF_DATA_INDEX,
+                                       CTC_DBF_DATA_PAGES,
                                       CTC_DBF_DATA_NR_AREAS,
                                       CTC_DBF_DATA_LEN);
        ctc_dbf_trace = debug_register(CTC_DBF_TRACE_NAME,
-                                        CTC_DBF_TRACE_INDEX,
+                                        CTC_DBF_TRACE_PAGES,
                                        CTC_DBF_TRACE_NR_AREAS,
                                        CTC_DBF_TRACE_LEN);
diff --git a/drivers/s390/net/ctcdbug.h b/drivers/s390/net/ctcdbug.h
index 7fe2ebd1792d..7d6afa1627c3 100644
--- a/drivers/s390/net/ctcdbug.h
+++ b/drivers/s390/net/ctcdbug.h
@@ -1,6 +1,6 @@
 /*
 *
- * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.5 $)
+ * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.6 $)
 *
 * CTC / ESCON network driver - s390 dbf exploit.
 *
@@ -9,7 +9,7 @@
 *    Author(s): Original Code written by
 *                        Peter Tiedemann (ptiedem@de.ibm.com)
 *
- *    $Revision: 1.5 $   $Date: 2005/02/27 19:46:44 $
+ *    $Revision: 1.6 $   $Date: 2005/05/11 08:10:17 $
 *
 * 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
@@ -35,19 +35,19 @@
 */
 #define CTC_DBF_SETUP_NAME "ctc_setup"
 #define CTC_DBF_SETUP_LEN 16
-#define CTC_DBF_SETUP_INDEX 3
+#define CTC_DBF_SETUP_PAGES 8
 #define CTC_DBF_SETUP_NR_AREAS 1
 #define CTC_DBF_SETUP_LEVEL 3
 #define CTC_DBF_DATA_NAME "ctc_data"
 #define CTC_DBF_DATA_LEN 128
-#define CTC_DBF_DATA_INDEX 3
+#define CTC_DBF_DATA_PAGES 8
 #define CTC_DBF_DATA_NR_AREAS 1
 #define CTC_DBF_DATA_LEVEL 3
 #define CTC_DBF_TRACE_NAME "ctc_trace"
 #define CTC_DBF_TRACE_LEN 16
-#define CTC_DBF_TRACE_INDEX 2
+#define CTC_DBF_TRACE_PAGES 4
 #define CTC_DBF_TRACE_NR_AREAS 2
 #define CTC_DBF_TRACE_LEVEL 3
diff --git a/drivers/s390/net/iucv.h b/drivers/s390/net/iucv.h
index 198330217eff..0c4644d3d2f3 100644
--- a/drivers/s390/net/iucv.h
+++ b/drivers/s390/net/iucv.h
@@ -37,19 +37,19 @@
 */
 #define IUCV_DBF_SETUP_NAME "iucv_setup"
 #define IUCV_DBF_SETUP_LEN 32
-#define IUCV_DBF_SETUP_INDEX 1
+#define IUCV_DBF_SETUP_PAGES 2
 #define IUCV_DBF_SETUP_NR_AREAS 1
 #define IUCV_DBF_SETUP_LEVEL 3
 #define IUCV_DBF_DATA_NAME "iucv_data"
 #define IUCV_DBF_DATA_LEN 128
-#define IUCV_DBF_DATA_INDEX 1
+#define IUCV_DBF_DATA_PAGES 2
 #define IUCV_DBF_DATA_NR_AREAS 1
 #define IUCV_DBF_DATA_LEVEL 2
 #define IUCV_DBF_TRACE_NAME "iucv_trace"
 #define IUCV_DBF_TRACE_LEN 16
-#define IUCV_DBF_TRACE_INDEX 2
+#define IUCV_DBF_TRACE_PAGES 4
 #define IUCV_DBF_TRACE_NR_AREAS 1
 #define IUCV_DBF_TRACE_LEVEL 3
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index ab086242d305..46f34ba93ac5 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -11,7 +11,7 @@
 *                        Frank Pavlic (pavlic@de.ibm.com) and
 *                        Martin Schwidefsky <schwidefsky@de.ibm.com>
 *
- *    $Revision: 1.98 $  $Date: 2005/04/18 13:41:29 $
+ *    $Revision: 1.99 $  $Date: 2005/05/11 08:10:17 $
 *
 * 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
@@ -59,7 +59,7 @@
 /**
 * initialization string for output
 */
-#define VERSION_LCS_C  "$Revision: 1.98 $"
+#define VERSION_LCS_C  "$Revision: 1.99 $"
 static char version[] __initdata = "LCS driver ("VERSION_LCS_C "/" VERSION_LCS_H ")";
 static char debug_buffer[255];
@@ -93,8 +93,8 @@ lcs_unregister_debug_facility(void)
 static int
 lcs_register_debug_facility(void)
 {
-        lcs_dbf_setup = debug_register("lcs_setup", 1, 1, 8);
+        lcs_dbf_setup = debug_register("lcs_setup", 2, 1, 8);
-        lcs_dbf_trace = debug_register("lcs_trace", 1, 2, 8);
+        lcs_dbf_trace = debug_register("lcs_trace", 2, 2, 8);
        if (lcs_dbf_setup == NULL || lcs_dbf_trace == NULL) {
                PRINT_ERR("Not enough memory for debug facility.\n");
                lcs_unregister_debug_facility();
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 3fd4fb754b2d..69425a7a6e98 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: netiucv.c,v 1.63 2004/07/27 13:36:05 mschwide Exp $
+ * $Id: netiucv.c,v 1.66 2005/05/11 08:10:17 holzheu Exp $
 *
 * IUCV network driver
 *
@@ -30,7 +30,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
- * RELEASE-TAG: IUCV network driver $Revision: 1.63 $
+ * RELEASE-TAG: IUCV network driver $Revision: 1.66 $
 *
 */
@@ -391,15 +391,15 @@ static int
 iucv_register_dbf_views(void)
 {
        iucv_dbf_setup = debug_register(IUCV_DBF_SETUP_NAME,
-                                        IUCV_DBF_SETUP_INDEX,
+                                        IUCV_DBF_SETUP_PAGES,
                                        IUCV_DBF_SETUP_NR_AREAS,
                                        IUCV_DBF_SETUP_LEN);
        iucv_dbf_data = debug_register(IUCV_DBF_DATA_NAME,
-                                       IUCV_DBF_DATA_INDEX,
+                                       IUCV_DBF_DATA_PAGES,
                                       IUCV_DBF_DATA_NR_AREAS,
                                       IUCV_DBF_DATA_LEN);
        iucv_dbf_trace = debug_register(IUCV_DBF_TRACE_NAME,
-                                        IUCV_DBF_TRACE_INDEX,
+                                        IUCV_DBF_TRACE_PAGES,
                                        IUCV_DBF_TRACE_NR_AREAS,
                                        IUCV_DBF_TRACE_LEN);
@@ -2076,7 +2076,7 @@ DRIVER_ATTR(remove, 0200, NULL, remove_write);
 static void
 netiucv_banner(void)
 {
-        char vbuf[] = "$Revision: 1.63 $";
+        char vbuf[] = "$Revision: 1.66 $";
        char *version = vbuf;
        if ((version = strchr(version, ':'))) {
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index a755b57db46b..008e0a5d2eb3 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -42,44 +42,44 @@
 */
 #define QETH_DBF_SETUP_NAME "qeth_setup"
 #define QETH_DBF_SETUP_LEN 8
-#define QETH_DBF_SETUP_INDEX 3
+#define QETH_DBF_SETUP_PAGES 8
 #define QETH_DBF_SETUP_NR_AREAS 1
 #define QETH_DBF_SETUP_LEVEL 5
 #define QETH_DBF_MISC_NAME "qeth_misc"
 #define QETH_DBF_MISC_LEN 128
-#define QETH_DBF_MISC_INDEX 1
+#define QETH_DBF_MISC_PAGES 2
 #define QETH_DBF_MISC_NR_AREAS 1
 #define QETH_DBF_MISC_LEVEL 2
 #define QETH_DBF_DATA_NAME "qeth_data"
 #define QETH_DBF_DATA_LEN 96
-#define QETH_DBF_DATA_INDEX 3
+#define QETH_DBF_DATA_PAGES 8
 #define QETH_DBF_DATA_NR_AREAS 1
 #define QETH_DBF_DATA_LEVEL 2
 #define QETH_DBF_CONTROL_NAME "qeth_control"
 #define QETH_DBF_CONTROL_LEN 256
-#define QETH_DBF_CONTROL_INDEX 3
+#define QETH_DBF_CONTROL_PAGES 8
 #define QETH_DBF_CONTROL_NR_AREAS 2
 #define QETH_DBF_CONTROL_LEVEL 5
 #define QETH_DBF_TRACE_NAME "qeth_trace"
 #define QETH_DBF_TRACE_LEN 8
-#define QETH_DBF_TRACE_INDEX 2
+#define QETH_DBF_TRACE_PAGES 4
 #define QETH_DBF_TRACE_NR_AREAS 2
 #define QETH_DBF_TRACE_LEVEL 3
 extern debug_info_t *qeth_dbf_trace;
 #define QETH_DBF_SENSE_NAME "qeth_sense"
 #define QETH_DBF_SENSE_LEN 64
-#define QETH_DBF_SENSE_INDEX 1
+#define QETH_DBF_SENSE_PAGES 2
 #define QETH_DBF_SENSE_NR_AREAS 1
 #define QETH_DBF_SENSE_LEVEL 2
 #define QETH_DBF_QERR_NAME "qeth_qerr"
 #define QETH_DBF_QERR_LEN 8
-#define QETH_DBF_QERR_INDEX 1
+#define QETH_DBF_QERR_PAGES 2
 #define QETH_DBF_QERR_NR_AREAS 2
 #define QETH_DBF_QERR_LEVEL 2
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 208127a5033a..3cb88c770037 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -7639,31 +7639,31 @@ static int
 qeth_register_dbf_views(void)
 {
        qeth_dbf_setup = debug_register(QETH_DBF_SETUP_NAME,
-                                        QETH_DBF_SETUP_INDEX,
+                                        QETH_DBF_SETUP_PAGES,
                                        QETH_DBF_SETUP_NR_AREAS,
                                        QETH_DBF_SETUP_LEN);
        qeth_dbf_misc = debug_register(QETH_DBF_MISC_NAME,
-                                       QETH_DBF_MISC_INDEX,
+                                       QETH_DBF_MISC_PAGES,
                                       QETH_DBF_MISC_NR_AREAS,
                                       QETH_DBF_MISC_LEN);
        qeth_dbf_data = debug_register(QETH_DBF_DATA_NAME,
-                                       QETH_DBF_DATA_INDEX,
+                                       QETH_DBF_DATA_PAGES,
                                       QETH_DBF_DATA_NR_AREAS,
                                       QETH_DBF_DATA_LEN);
        qeth_dbf_control = debug_register(QETH_DBF_CONTROL_NAME,
-                                          QETH_DBF_CONTROL_INDEX,
+                                          QETH_DBF_CONTROL_PAGES,
                                          QETH_DBF_CONTROL_NR_AREAS,
                                          QETH_DBF_CONTROL_LEN);
        qeth_dbf_sense = debug_register(QETH_DBF_SENSE_NAME,
-                                        QETH_DBF_SENSE_INDEX,
+                                        QETH_DBF_SENSE_PAGES,
                                        QETH_DBF_SENSE_NR_AREAS,
                                        QETH_DBF_SENSE_LEN);
        qeth_dbf_qerr = debug_register(QETH_DBF_QERR_NAME,
-                                       QETH_DBF_QERR_INDEX,
+                                       QETH_DBF_QERR_PAGES,
                                       QETH_DBF_QERR_NR_AREAS,
                                       QETH_DBF_QERR_LEN);
        qeth_dbf_trace = debug_register(QETH_DBF_TRACE_NAME,
-                                        QETH_DBF_TRACE_INDEX,
+                                        QETH_DBF_TRACE_PAGES,
                                        QETH_DBF_TRACE_NR_AREAS,
                                        QETH_DBF_TRACE_LEN);
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 1e3f7f3c662f..d6469baa7e16 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -138,7 +138,7 @@ static void __exit
 smsg_exit(void)
 {
        if (smsg_handle > 0) {
-                cpcmd("SET SMSG OFF", 0, 0);
+                cpcmd("SET SMSG OFF", NULL, 0, NULL);
                iucv_sever(smsg_pathid, 0);
                iucv_unregister_program(smsg_handle);
                driver_unregister(&smsg_driver);
@@ -177,7 +177,7 @@ smsg_init(void)
                smsg_handle = 0;
                return -EIO;
        }
-        cpcmd("SET SMSG IUCV", 0, 0);
+        cpcmd("SET SMSG IUCV", NULL, 0, NULL);
        return 0;
 }
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index ffa996c8a908..5bb255e02acc 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -31,14 +31,14 @@ extern void css_reiterate_subchannels(void);
 extern struct workqueue_struct *slow_path_wq;
 extern struct work_struct slow_path_work;
-static void
+static NORET_TYPE void
 s390_handle_damage(char *msg)
 {
-        printk(KERN_EMERG "%s\n", msg);
 #ifdef CONFIG_SMP
        smp_send_stop();
 #endif
        disabled_wait((unsigned long) __builtin_return_address(0));
+        for(;;);
 }
 /*
@@ -122,40 +122,39 @@ repeat:
        return 0;
 }
+struct mcck_struct {
+        int kill_task;
+        int channel_report;
+        int warning;
+        unsigned long long mcck_code;
+};
+static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck);
 /*
- * machine check handler.
+ * Main machine check handler function. Will be called with interrupts enabled
+ * or disabled and machine checks enabled or disabled.
 */
 void
-s390_do_machine_check(void)
+s390_handle_mcck(void)
 {
-        struct mci *mci;
+        unsigned long flags;
+        struct mcck_struct mcck;
-        mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
-        if (mci->sd)            /* system damage */
+        /*
-                s390_handle_damage("received system damage machine check\n");
+         * Disable machine checks and get the current state of accumulated
+         * machine checks. Afterwards delete the old state and enable machine
+         * checks again.
+         */
+        local_irq_save(flags);
+        local_mcck_disable();
+        mcck = __get_cpu_var(cpu_mcck);
+        memset(&__get_cpu_var(cpu_mcck), 0, sizeof(struct mcck_struct));
+        clear_thread_flag(TIF_MCCK_PENDING);
+        local_mcck_enable();
+        local_irq_restore(flags);
-        if (mci->pd)            /* instruction processing damage */
+        if (mcck.channel_report)
-                s390_handle_damage("received instruction processing "
-                                   "damage machine check\n");
-        if (mci->se)            /* storage error uncorrected */
-                s390_handle_damage("received storage error uncorrected "
-                                   "machine check\n");
-        if (mci->sc)            /* storage error corrected */
-                printk(KERN_WARNING
-                       "received storage error corrected machine check\n");
-        if (mci->ke)            /* storage key-error uncorrected */
-                s390_handle_damage("received storage key-error uncorrected "
-                                   "machine check\n");
-        if (mci->ds && mci->fa) /* storage degradation */
-                s390_handle_damage("received storage degradation machine "
-                                   "check\n");
-        if (mci->cp)            /* channel report word pending */
                up(&m_sem);
 #ifdef CONFIG_MACHCHK_WARNING
@@ -168,7 +167,7 @@ s390_do_machine_check(void)
 * On VM we only get one interrupt per virtally presented machinecheck.
 * Though one suffices, we may get one interrupt per (virtual) processor.
 */
-        if (mci->w) {   /* WARNING pending ? */
+        if (mcck.warning) {     /* WARNING pending ? */
                static int mchchk_wng_posted = 0;
                /*
                 * Use single machine clear, as we cannot handle smp right now
@@ -178,6 +177,261 @@ s390_do_machine_check(void)
                        kill_proc(1, SIGPWR, 1);
        }
 #endif
+        if (mcck.kill_task) {
+                local_irq_enable();
+                printk(KERN_EMERG "mcck: Terminating task because of machine "
+                       "malfunction (code 0x%016llx).\n", mcck.mcck_code);
+                printk(KERN_EMERG "mcck: task: %s, pid: %d.\n",
+                       current->comm, current->pid);
+                do_exit(SIGSEGV);
+        }
+}
+/*
+ * returns 0 if all registers could be validated
+ * returns 1 otherwise
+ */
+static int
+s390_revalidate_registers(struct mci *mci)
+{
+        int kill_task;
+        u64 tmpclock;
+        u64 zero;
+        void *fpt_save_area, *fpt_creg_save_area;
+        kill_task = 0;
+        zero = 0;
+        /* General purpose registers */
+        if (!mci->gr)
+                /*
+                 * General purpose registers couldn't be restored and have
+                 * unknown contents. Process needs to be terminated.
+                 */
+                kill_task = 1;
+        /* Revalidate floating point registers */
+        if (!mci->fp)
+                /*
+                 * Floating point registers can't be restored and
+                 * therefore the process needs to be terminated.
+                 */
+                kill_task = 1;
+#ifndef __s390x__
+        asm volatile("ld 0,0(%0)\n"
+                     "ld 2,8(%0)\n"
+                     "ld 4,16(%0)\n"
+                     "ld 6,24(%0)"
+                     : : "a" (&S390_lowcore.floating_pt_save_area));
+#endif
+        if (MACHINE_HAS_IEEE) {
+#ifdef __s390x__
+                fpt_save_area = &S390_lowcore.floating_pt_save_area;
+                fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area;
+#else
+                fpt_save_area = (void *) S390_lowcore.extended_save_area_addr;
+                fpt_creg_save_area = fpt_save_area+128;
+#endif
+                /* Floating point control register */
+                if (!mci->fc) {
+                        /*
+                         * Floating point control register can't be restored.
+                         * Task will be terminated.
+                         */
+                        asm volatile ("lfpc 0(%0)" : : "a" (&zero));
+                        kill_task = 1;
+                }
+                else
+                        asm volatile (
+                                "lfpc 0(%0)"
+                                : : "a" (fpt_creg_save_area));
+                asm volatile("ld  0,0(%0)\n"
+                             "ld  1,8(%0)\n"
+                             "ld  2,16(%0)\n"
+                             "ld  3,24(%0)\n"
+                             "ld  4,32(%0)\n"
+                             "ld  5,40(%0)\n"
+                             "ld  6,48(%0)\n"
+                             "ld  7,56(%0)\n"
+                             "ld  8,64(%0)\n"
+                             "ld  9,72(%0)\n"
+                             "ld 10,80(%0)\n"
+                             "ld 11,88(%0)\n"
+                             "ld 12,96(%0)\n"
+                             "ld 13,104(%0)\n"
+                             "ld 14,112(%0)\n"
+                             "ld 15,120(%0)\n"
+                             : : "a" (fpt_save_area));
+        }
+        /* Revalidate access registers */
+        asm volatile("lam 0,15,0(%0)"
+                     : : "a" (&S390_lowcore.access_regs_save_area));
+        if (!mci->ar)
+                /*
+                 * Access registers have unknown contents.
+                 * Terminating task.
+                 */
+                kill_task = 1;
+        /* Revalidate control registers */
+        if (!mci->cr)
+                /*
+                 * Control registers have unknown contents.
+                 * Can't recover and therefore stopping machine.
+                 */
+                s390_handle_damage("invalid control registers.");
+        else
+#ifdef __s390x__
+                asm volatile("lctlg 0,15,0(%0)"
+                             : : "a" (&S390_lowcore.cregs_save_area));
+#else
+                asm volatile("lctl 0,15,0(%0)"
+                             : : "a" (&S390_lowcore.cregs_save_area));
+#endif
+        /*
+         * We don't even try to revalidate the TOD register, since we simply
+         * can't write something sensible into that register.
+         */
+#ifdef __s390x__
+        /*
+         * See if we can revalidate the TOD programmable register with its
+         * old contents (should be zero) otherwise set it to zero.
+         */
+        if (!mci->pr)
+                asm volatile("sr 0,0\n"
+                             "sckpf"
+                             : : : "0", "cc");
+        else
+                asm volatile(
+                        "l 0,0(%0)\n"
+                        "sckpf"
+                        : : "a" (&S390_lowcore.tod_progreg_save_area) : "0", "cc");
+#endif
+        /* Revalidate clock comparator register */
+        asm volatile ("stck 0(%1)\n"
+                      "sckc 0(%1)"
+                      : "=m" (tmpclock) : "a" (&(tmpclock)) : "cc", "memory");
+        /* Check if old PSW is valid */
+        if (!mci->wp)
+                /*
+                 * Can't tell if we come from user or kernel mode
+                 * -> stopping machine.
+                 */
+                s390_handle_damage("old psw invalid.");
+        if (!mci->ms || !mci->pm || !mci->ia)
+                kill_task = 1;
+        return kill_task;
+}
+/*
+ * machine check handler.
+ */
+void
+s390_do_machine_check(struct pt_regs *regs)
+{
+        struct mci *mci;
+        struct mcck_struct *mcck;
+        int umode;
+        mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
+        mcck = &__get_cpu_var(cpu_mcck);
+        umode = user_mode(regs);
+        if (mci->sd)
+                /* System damage -> stopping machine */
+                s390_handle_damage("received system damage machine check.");
+        if (mci->pd) {
+                if (mci->b) {
+                        /* Processing backup -> verify if we can survive this */
+                        u64 z_mcic, o_mcic, t_mcic;
+#ifdef __s390x__
+                        z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<29);
+                        o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
+                                  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
+                                  1ULL<<30 | 1ULL<<21 | 1ULL<<20 | 1ULL<<17 |
+                                  1ULL<<16);
+#else
+                        z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<57 | 1ULL<<50 |
+                                  1ULL<<29);
+                        o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
+                                  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
+                                  1ULL<<30 | 1ULL<<20 | 1ULL<<17 | 1ULL<<16);
+#endif
+                        t_mcic = *(u64 *)mci;
+                        if (((t_mcic & z_mcic) != 0) ||
+                            ((t_mcic & o_mcic) != o_mcic)) {
+                                s390_handle_damage("processing backup machine "
+                                                   "check with damage.");
+                        }
+                        if (!umode)
+                                s390_handle_damage("processing backup machine "
+                                                   "check in kernel mode.");
+                        mcck->kill_task = 1;
+                        mcck->mcck_code = *(unsigned long long *) mci;
+                }
+                else {
+                        /* Processing damage -> stopping machine */
+                        s390_handle_damage("received instruction processing "
+                                           "damage machine check.");
+                }
+        }
+        if (s390_revalidate_registers(mci)) {
+                if (umode) {
+                        /*
+                         * Couldn't restore all register contents while in
+                         * user mode -> mark task for termination.
+                         */
+                        mcck->kill_task = 1;
+                        mcck->mcck_code = *(unsigned long long *) mci;
+                        set_thread_flag(TIF_MCCK_PENDING);
+                }
+                else
+                        /*
+                         * Couldn't restore all register contents while in
+                         * kernel mode -> stopping machine.
+                         */
+                        s390_handle_damage("unable to revalidate registers.");
+        }
+        if (mci->se)
+                /* Storage error uncorrected */
+                s390_handle_damage("received storage error uncorrected "
+                                   "machine check.");
+        if (mci->ke)
+                /* Storage key-error uncorrected */
+                s390_handle_damage("received storage key-error uncorrected "
+                                   "machine check.");
+        if (mci->ds && mci->fa)
+                /* Storage degradation */
+                s390_handle_damage("received storage degradation machine "
+                                   "check.");
+        if (mci->cp) {
+                /* Channel report word pending */
+                mcck->channel_report = 1;
+                set_thread_flag(TIF_MCCK_PENDING);
+        }
+        if (mci->w) {
+                /* Warning pending */
+                mcck->warning = 1;
+                set_thread_flag(TIF_MCCK_PENDING);
+        }
 }
 /*
@@ -189,9 +443,8 @@ static int
 machine_check_init(void)
 {
        init_MUTEX_LOCKED(&m_sem);
-        ctl_clear_bit(14, 25);  /* disable damage MCH */
+        ctl_clear_bit(14, 25);  /* disable external damage MCH */
-        ctl_set_bit(14, 26);    /* enable degradation MCH */
+        ctl_set_bit(14, 27);    /* enable system recovery MCH */
-        ctl_set_bit(14, 27);    /* enable system recovery MCH */
 #ifdef CONFIG_MACHCHK_WARNING
        ctl_set_bit(14, 24);    /* enable warning MCH */
 #endif
diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index 7e26f0f1b0dc..4eaa70179182 100644
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -16,20 +16,45 @@ struct mci {
        __u32   sd              :  1; /* 00 system damage */
        __u32   pd              :  1; /* 01 instruction-processing damage */
        __u32   sr              :  1; /* 02 system recovery */
-        __u32   to_be_defined_1 :  4; /* 03-06 */
+        __u32   to_be_defined_1 :  1; /* 03 */
+        __u32   cd              :  1; /* 04 timing-facility damage */
+        __u32   ed              :  1; /* 05 external damage */
+        __u32   to_be_defined_2 :  1; /* 06 */
        __u32   dg              :  1; /* 07 degradation */
        __u32   w               :  1; /* 08 warning pending */
        __u32   cp              :  1; /* 09 channel-report pending */
-        __u32   to_be_defined_2 :  6; /* 10-15 */
+        __u32   sp              :  1; /* 10 service-processor damage */
+        __u32   ck              :  1; /* 11 channel-subsystem damage */
+        __u32   to_be_defined_3 :  2; /* 12-13 */
+        __u32   b               :  1; /* 14 backed up */
+        __u32   to_be_defined_4 :  1; /* 15 */
        __u32   se              :  1; /* 16 storage error uncorrected */
        __u32   sc              :  1; /* 17 storage error corrected */
        __u32   ke              :  1; /* 18 storage-key error uncorrected */
        __u32   ds              :  1; /* 19 storage degradation */
-        __u32   to_be_defined_3 :  4; /* 20-23 */
+        __u32   wp              :  1; /* 20 psw mwp validity */
+        __u32   ms              :  1; /* 21 psw mask and key validity */
+        __u32   pm              :  1; /* 22 psw program mask and cc validity */
+        __u32   ia              :  1; /* 23 psw instruction address validity */
        __u32   fa              :  1; /* 24 failing storage address validity */
-        __u32   to_be_defined_4 :  7; /* 25-31 */
+        __u32   to_be_defined_5 :  1; /* 25 */
+        __u32   ec              :  1; /* 26 external damage code validity */
+        __u32   fp              :  1; /* 27 floating point register validity */
+        __u32   gr              :  1; /* 28 general register validity */
+        __u32   cr              :  1; /* 29 control register validity */
+        __u32   to_be_defined_6 :  1; /* 30 */
+        __u32   st              :  1; /* 31 storage logical validity */
        __u32   ie              :  1; /* 32 indirect storage error */
-        __u32   to_be_defined_5 : 31; /* 33-63 */
+        __u32   ar              :  1; /* 33 access register validity */
+        __u32   da              :  1; /* 34 delayed access exception */
+        __u32   to_be_defined_7 :  7; /* 35-41 */
+        __u32   pr              :  1; /* 42 tod programmable register validity */
+        __u32   fc              :  1; /* 43 fp control register validity */
+        __u32   ap              :  1; /* 44 ancillary report */
+        __u32   to_be_defined_8 :  1; /* 45 */
+        __u32   ct              :  1; /* 46 cpu timer validity */
+        __u32   cc              :  1; /* 47 clock comparator validity */
+        __u32   to_be_defined_9 : 16; /* 47-63 */
 };
 /*
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index a699c30b2662..bbe346bd3cb8 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -34,7 +34,6 @@
 #define ADDR32 (0)
-#include <linux/version.h>
 #include <linux/module.h>
 MODULE_AUTHOR("Deanna Bonds, with _lots_ of help from Mark Salyzyn");
@@ -1811,9 +1810,9 @@ static int adpt_system_info(void __user *buffer)
        memset(&si, 0, sizeof(si));
        si.osType = OS_LINUX;
-        si.osMajorVersion = (u8) (LINUX_VERSION_CODE >> 16);
+        si.osMajorVersion = 0;
-        si.osMinorVersion = (u8) (LINUX_VERSION_CODE >> 8 & 0x0ff);
+        si.osMinorVersion = 0;
-        si.osRevision =     (u8) (LINUX_VERSION_CODE & 0x0ff);
+        si.osRevision = 0;
        si.busType = SI_PCI_BUS;
        si.processorFamily = DPTI_sig.dsProcessorFamily;
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h
index 9821783c0164..489194af43d0 100644
--- a/drivers/scsi/dpti.h
+++ b/drivers/scsi/dpti.h
@@ -20,15 +20,7 @@
 #ifndef _DPT_H
 #define _DPT_H
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,00)
-#define MAX_TO_IOP_MESSAGES   (210)
-#else
 #define MAX_TO_IOP_MESSAGES   (255)
-#endif
 #define MAX_FROM_IOP_MESSAGES (255)
@@ -321,10 +313,6 @@ static int adpt_close(struct inode *inode, struct file *file);
 static void adpt_delay(int millisec);
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static struct pci_dev* adpt_pci_find_device(uint vendor, struct pci_dev* from);
-#endif
 #if defined __ia64__ 
 static void adpt_ia64_info(sysInfo_S* si);
 #endif
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index f7ddc9f1ba41..2094d4811d61 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -223,7 +223,7 @@ static void tul_select_atn(HCS * pCurHcb, SCB * pCurScb);
 static void tul_select_atn3(HCS * pCurHcb, SCB * pCurScb);
 static void tul_select_atn_stop(HCS * pCurHcb, SCB * pCurScb);
 static int int_tul_busfree(HCS * pCurHcb);
-int int_tul_scsi_rst(HCS * pCurHcb);
+static int int_tul_scsi_rst(HCS * pCurHcb);
 static int int_tul_bad_seq(HCS * pCurHcb);
 static int int_tul_resel(HCS * pCurHcb);
 static int tul_sync_done(HCS * pCurHcb);
@@ -240,9 +240,8 @@ static int tul_se2_rd_all(WORD CurBase);
 static void tul_se2_update_all(WORD CurBase);   /* setup default pattern */
 static void tul_read_eeprom(WORD CurBase);
-                                /* ---- EXTERNAL VARIABLES ---- */
-HCS tul_hcs[MAX_SUPPORTED_ADAPTERS];
                                /* ---- INTERNAL VARIABLES ---- */
+static HCS tul_hcs[MAX_SUPPORTED_ADAPTERS];
 static INI_ADPT_STRUCT i91u_adpt[MAX_SUPPORTED_ADAPTERS];
 /*NVRAM nvram, *nvramp = &nvram; */
@@ -381,7 +380,7 @@ void tul_se2_wait(void)
 ******************************************************************/
-void tul_se2_instr(WORD CurBase, UCHAR instr)
+static void tul_se2_instr(WORD CurBase, UCHAR instr)
 {
        int i;
        UCHAR b;
@@ -437,7 +436,7 @@ void tul_se2_ew_ds(WORD CurBase)
        Input  :address of Serial E2PROM
        Output :value stored in  Serial E2PROM
 *******************************************************************/
-USHORT tul_se2_rd(WORD CurBase, ULONG adr)
+static USHORT tul_se2_rd(WORD CurBase, ULONG adr)
 {
        UCHAR instr, readByte;
        USHORT readWord;
@@ -468,7 +467,7 @@ USHORT tul_se2_rd(WORD CurBase, ULONG adr)
 /******************************************************************
 Input: new value in  Serial E2PROM, address of Serial E2PROM
 *******************************************************************/
-void tul_se2_wr(WORD CurBase, UCHAR adr, USHORT writeWord)
+static void tul_se2_wr(WORD CurBase, UCHAR adr, USHORT writeWord)
 {
        UCHAR readByte;
        UCHAR instr;
@@ -584,8 +583,8 @@ void tul_read_eeprom(WORD CurBase)
        TUL_WR(CurBase + TUL_GCTRL, gctrl & ~TUL_GCTRL_EEPROM_BIT);
 }                               /* read_eeprom */
-int Addi91u_into_Adapter_table(WORD wBIOS, WORD wBASE, BYTE bInterrupt,
+static int Addi91u_into_Adapter_table(WORD wBIOS, WORD wBASE, BYTE bInterrupt,
-                               BYTE bBus, BYTE bDevice)
+                                      BYTE bBus, BYTE bDevice)
 {
        int i, j;
@@ -616,7 +615,7 @@ int Addi91u_into_Adapter_table(WORD wBIOS, WORD wBASE, BYTE bInterrupt,
        return 1;
 }
-void init_i91uAdapter_table(void)
+static void init_i91uAdapter_table(void)
 {
        int i;
@@ -630,7 +629,7 @@ void init_i91uAdapter_table(void)
        return;
 }
-void tul_stop_bm(HCS * pCurHcb)
+static void tul_stop_bm(HCS * pCurHcb)
 {
        if (TUL_RD(pCurHcb->HCS_Base, TUL_XStatus) & XPEND) {   /* if DMA xfer is pending, abort DMA xfer */
@@ -642,7 +641,7 @@ void tul_stop_bm(HCS * pCurHcb)
 }
 /***************************************************************************/
-void get_tulipPCIConfig(HCS * pCurHcb, int ch_idx)
+static void get_tulipPCIConfig(HCS * pCurHcb, int ch_idx)
 {
        pCurHcb->HCS_Base = i91u_adpt[ch_idx].ADPT_BASE;        /* Supply base address  */
        pCurHcb->HCS_BIOS = i91u_adpt[ch_idx].ADPT_BIOS;        /* Supply BIOS address  */
@@ -651,7 +650,7 @@ void get_tulipPCIConfig(HCS * pCurHcb, int ch_idx)
 }
 /***************************************************************************/
-int tul_reset_scsi(HCS * pCurHcb, int seconds)
+static int tul_reset_scsi(HCS * pCurHcb, int seconds)
 {
        TUL_WR(pCurHcb->HCS_Base + TUL_SCtrl0, TSC_RST_BUS);
@@ -670,7 +669,8 @@ int tul_reset_scsi(HCS * pCurHcb, int seconds)
 }
 /***************************************************************************/
-int init_tulip(HCS * pCurHcb, SCB * scbp, int tul_num_scb, BYTE * pbBiosAdr, int seconds)
+static int init_tulip(HCS * pCurHcb, SCB * scbp, int tul_num_scb,
+                      BYTE * pbBiosAdr, int seconds)
 {
        int i;
        BYTE *pwFlags;
@@ -788,7 +788,7 @@ int init_tulip(HCS * pCurHcb, SCB * scbp, int tul_num_scb, BYTE * pbBiosAdr, int
 }
 /***************************************************************************/
-SCB *tul_alloc_scb(HCS * hcsp)
+static SCB *tul_alloc_scb(HCS * hcsp)
 {
        SCB *pTmpScb;
        ULONG flags;
@@ -807,7 +807,7 @@ SCB *tul_alloc_scb(HCS * hcsp)
 }
 /***************************************************************************/
-void tul_release_scb(HCS * hcsp, SCB * scbp)
+static void tul_release_scb(HCS * hcsp, SCB * scbp)
 {
        ULONG flags;
@@ -829,7 +829,7 @@ void tul_release_scb(HCS * hcsp, SCB * scbp)
 }
 /***************************************************************************/
-void tul_append_pend_scb(HCS * pCurHcb, SCB * scbp)
+static void tul_append_pend_scb(HCS * pCurHcb, SCB * scbp)
 {
 #if DEBUG_QUEUE
@@ -847,7 +847,7 @@ void tul_append_pend_scb(HCS * pCurHcb, SCB * scbp)
 }
 /***************************************************************************/
-void tul_push_pend_scb(HCS * pCurHcb, SCB * scbp)
+static void tul_push_pend_scb(HCS * pCurHcb, SCB * scbp)
 {
 #if DEBUG_QUEUE
@@ -863,7 +863,7 @@ void tul_push_pend_scb(HCS * pCurHcb, SCB * scbp)
 }
 /***************************************************************************/
-SCB *tul_find_first_pend_scb(HCS * pCurHcb)
+static SCB *tul_find_first_pend_scb(HCS * pCurHcb)
 {
        SCB *pFirstPend;
@@ -894,24 +894,7 @@ SCB *tul_find_first_pend_scb(HCS * pCurHcb)
        return (pFirstPend);
 }
 /***************************************************************************/
-SCB *tul_pop_pend_scb(HCS * pCurHcb)
+static void tul_unlink_pend_scb(HCS * pCurHcb, SCB * pCurScb)
-{
-        SCB *pTmpScb;
-        if ((pTmpScb = pCurHcb->HCS_FirstPend) != NULL) {
-                if ((pCurHcb->HCS_FirstPend = pTmpScb->SCB_NxtScb) == NULL)
-                        pCurHcb->HCS_LastPend = NULL;
-                pTmpScb->SCB_NxtScb = NULL;
-        }
-#if DEBUG_QUEUE
-        printk("Pop pend SCB %lx; ", (ULONG) pTmpScb);
-#endif
-        return (pTmpScb);
-}
-/***************************************************************************/
-void tul_unlink_pend_scb(HCS * pCurHcb, SCB * pCurScb)
 {
        SCB *pTmpScb, *pPrevScb;
@@ -939,7 +922,7 @@ void tul_unlink_pend_scb(HCS * pCurHcb, SCB * pCurScb)
        return;
 }
 /***************************************************************************/
-void tul_append_busy_scb(HCS * pCurHcb, SCB * scbp)
+static void tul_append_busy_scb(HCS * pCurHcb, SCB * scbp)
 {
 #if DEBUG_QUEUE
@@ -961,7 +944,7 @@ void tul_append_busy_scb(HCS * pCurHcb, SCB * scbp)
 }
 /***************************************************************************/
-SCB *tul_pop_busy_scb(HCS * pCurHcb)
+static SCB *tul_pop_busy_scb(HCS * pCurHcb)
 {
        SCB *pTmpScb;
@@ -982,7 +965,7 @@ SCB *tul_pop_busy_scb(HCS * pCurHcb)
 }
 /***************************************************************************/
-void tul_unlink_busy_scb(HCS * pCurHcb, SCB * pCurScb)
+static void tul_unlink_busy_scb(HCS * pCurHcb, SCB * pCurScb)
 {
        SCB *pTmpScb, *pPrevScb;
@@ -1037,7 +1020,7 @@ SCB *tul_find_busy_scb(HCS * pCurHcb, WORD tarlun)
 }
 /***************************************************************************/
-void tul_append_done_scb(HCS * pCurHcb, SCB * scbp)
+static void tul_append_done_scb(HCS * pCurHcb, SCB * scbp)
 {
 #if DEBUG_QUEUE
@@ -1073,7 +1056,7 @@ SCB *tul_find_done_scb(HCS * pCurHcb)
 }
 /***************************************************************************/
-int tul_abort_srb(HCS * pCurHcb, struct scsi_cmnd *srbp)
+static int tul_abort_srb(HCS * pCurHcb, struct scsi_cmnd *srbp)
 {
        ULONG flags;
        SCB *pTmpScb, *pPrevScb;
@@ -1163,7 +1146,7 @@ int tul_abort_srb(HCS * pCurHcb, struct scsi_cmnd *srbp)
 }
 /***************************************************************************/
-int tul_bad_seq(HCS * pCurHcb)
+static int tul_bad_seq(HCS * pCurHcb)
 {
        SCB *pCurScb;
@@ -1182,9 +1165,11 @@ int tul_bad_seq(HCS * pCurHcb)
        return (tul_post_scsi_rst(pCurHcb));
 }
+#if 0
 /************************************************************************/
-int tul_device_reset(HCS * pCurHcb, struct scsi_cmnd *pSrb,
+static int tul_device_reset(HCS * pCurHcb, struct scsi_cmnd *pSrb,
-                unsigned int target, unsigned int ResetFlags)
+                            unsigned int target, unsigned int ResetFlags)
 {
        ULONG flags;
        SCB *pScb;
@@ -1255,7 +1240,7 @@ int tul_device_reset(HCS * pCurHcb, struct scsi_cmnd *pSrb,
        return SCSI_RESET_PENDING;
 }
-int tul_reset_scsi_bus(HCS * pCurHcb)
+static int tul_reset_scsi_bus(HCS * pCurHcb)
 {
        ULONG flags;
@@ -1284,8 +1269,10 @@ int tul_reset_scsi_bus(HCS * pCurHcb)
        return (SCSI_RESET_SUCCESS | SCSI_RESET_HOST_RESET);
 }
+#endif  /*  0  */
 /************************************************************************/
-void tul_exec_scb(HCS * pCurHcb, SCB * pCurScb)
+static void tul_exec_scb(HCS * pCurHcb, SCB * pCurScb)
 {
        ULONG flags;
@@ -1318,7 +1305,7 @@ void tul_exec_scb(HCS * pCurHcb, SCB * pCurScb)
 }
 /***************************************************************************/
-int tul_isr(HCS * pCurHcb)
+static int tul_isr(HCS * pCurHcb)
 {
        /* Enter critical section       */
@@ -2108,7 +2095,7 @@ int int_tul_busfree(HCS * pCurHcb)
 /***************************************************************************/
 /* scsi bus reset */
-int int_tul_scsi_rst(HCS * pCurHcb)
+static int int_tul_scsi_rst(HCS * pCurHcb)
 {
        SCB *pCurScb;
        int i;
@@ -2214,7 +2201,7 @@ int int_tul_resel(HCS * pCurHcb)
 /***************************************************************************/
-int int_tul_bad_seq(HCS * pCurHcb)
+static int int_tul_bad_seq(HCS * pCurHcb)
 {                               /* target wrong phase           */
        SCB *pCurScb;
        int i;
diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h
index df3ed7c1cee3..3efb1184fc39 100644
--- a/drivers/scsi/initio.h
+++ b/drivers/scsi/initio.h
@@ -719,21 +719,3 @@ typedef struct _HCSinfo {
 #define SCSI_RESET_HOST_RESET 0x200
 #define SCSI_RESET_ACTION   0xff
-extern void init_i91uAdapter_table(void);
-extern int Addi91u_into_Adapter_table(WORD, WORD, BYTE, BYTE, BYTE);
-extern int tul_ReturnNumberOfAdapters(void);
-extern void get_tulipPCIConfig(HCS * pHCB, int iChannel_index);
-extern int init_tulip(HCS * pHCB, SCB * pSCB, int tul_num_scb, BYTE * pbBiosAdr, int reset_time);
-extern SCB *tul_alloc_scb(HCS * pHCB);
-extern int tul_abort_srb(HCS * pHCB, struct scsi_cmnd * pSRB);
-extern void tul_exec_scb(HCS * pHCB, SCB * pSCB);
-extern void tul_release_scb(HCS * pHCB, SCB * pSCB);
-extern void tul_stop_bm(HCS * pHCB);
-extern int tul_reset_scsi(HCS * pCurHcb, int seconds);
-extern int tul_isr(HCS * pHCB);
-extern int tul_reset(HCS * pHCB, struct scsi_cmnd * pSRB, unsigned char target);
-extern int tul_reset_scsi_bus(HCS * pCurHcb);
-extern int tul_device_reset(HCS * pCurHcb, struct scsi_cmnd *pSrb,
-                unsigned int target, unsigned int ResetFlags);
-                                /* ---- EXTERNAL VARIABLES ---- */
-extern HCS tul_hcs[];
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index db92a0ceda79..feb8e73fc1c9 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -992,18 +992,17 @@ static int get_lsr_info(struct m68k_serial * info, unsigned int *value)
 /*
 * This routine sends a break character out the serial port.
 */
-static void send_break( struct m68k_serial * info, int duration)
+static void send_break(struct m68k_serial * info, unsigned int duration)
 {
        m68328_uart *uart = &uart_addr[info->line];
        unsigned long flags;
        if (!info->port)
                return;
-        set_current_state(TASK_INTERRUPTIBLE);
        save_flags(flags);
        cli();
 #ifdef USE_INTS 
        uart->utx.w |= UTX_SEND_BREAK;
-        schedule_timeout(duration);
+        msleep_interruptible(duration);
        uart->utx.w &= ~UTX_SEND_BREAK;
 #endif          
        restore_flags(flags);
@@ -1033,14 +1032,14 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
                                return retval;
                        tty_wait_until_sent(tty, 0);
                        if (!arg)
-                                send_break(info, HZ/4); /* 1/4 second */
+                                send_break(info, 250);  /* 1/4 second */
                        return 0;
                case TCSBRKP:   /* support for POSIX tcsendbreak() */
                        retval = tty_check_change(tty);
                        if (retval)
                                return retval;
                        tty_wait_until_sent(tty, 0);
-                        send_break(info, arg ? arg*(HZ/10) : HZ/4);
+                        send_break(info, arg ? arg*(100) : 250);
                        return 0;
                case TIOCGSOFTCAR:
                        error = put_user(C_CLOCAL(tty) ? 1 : 0,
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index f148022b6b4e..b116122e569a 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -1394,14 +1394,13 @@ static void end_break(ser_info_t *info)
 /*
 * This routine sends a break character out the serial port.
 */
-static void send_break(ser_info_t *info, int duration)
+static void send_break(ser_info_t *info, unsigned int duration)
 {
-        set_current_state(TASK_INTERRUPTIBLE);
 #ifdef SERIAL_DEBUG_SEND_BREAK
        printk("rs_send_break(%d) jiff=%lu...", duration, jiffies);
 #endif
        begin_break(info);
-        schedule_timeout(duration);
+        msleep_interruptible(duration);
        end_break(info);
 #ifdef SERIAL_DEBUG_SEND_BREAK
        printk("done jiffies=%lu\n", jiffies);
@@ -1436,7 +1435,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
                        if (signal_pending(current))
                                return -EINTR;
                        if (!arg) {
-                                send_break(info, HZ/4); /* 1/4 second */
+                                send_break(info, 250);  /* 1/4 second */
                                if (signal_pending(current))
                                        return -EINTR;
                        }
@@ -1448,7 +1447,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
                        tty_wait_until_sent(tty, 0);
                        if (signal_pending(current))
                                return -EINTR;
-                        send_break(info, arg ? arg*(HZ/10) : HZ/4);
+                        send_break(info, arg ? arg*100 : 250);
                        if (signal_pending(current))
                                return -EINTR;
                        return 0;
diff --git a/drivers/serial/icom.h b/drivers/serial/icom.h
index 23dc0f7ddf8b..798f1ef23712 100644
--- a/drivers/serial/icom.h
+++ b/drivers/serial/icom.h
@@ -286,5 +286,3 @@ struct lookup_int_table {
        u32     __iomem *global_int_mask;
        unsigned long   processor_id;
 };
-#define MSECS_TO_JIFFIES(ms) (((ms)*HZ+999)/1000)
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index a8314aee2ab8..a2a643318002 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -67,7 +67,11 @@
 static struct mpsc_port_info mpsc_ports[MPSC_NUM_CTLRS];
 static struct mpsc_shared_regs mpsc_shared_regs;
+static struct uart_driver mpsc_reg;
+static void mpsc_start_rx(struct mpsc_port_info *pi);
+static void mpsc_free_ring_mem(struct mpsc_port_info *pi);
+static void mpsc_release_port(struct uart_port *port);
 /*
 ******************************************************************************
 *
@@ -546,7 +550,6 @@ static int
 mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
 {
        int rc = 0;
-        static void mpsc_free_ring_mem(struct mpsc_port_info *pi);
        pr_debug("mpsc_alloc_ring_mem[%d]: Allocating ring mem\n",
                pi->port.line);
@@ -745,7 +748,6 @@ mpsc_rx_intr(struct mpsc_port_info *pi, struct pt_regs *regs)
        int     rc = 0;
        u8      *bp;
        char    flag = TTY_NORMAL;
-        static void mpsc_start_rx(struct mpsc_port_info *pi);
        pr_debug("mpsc_rx_intr[%d]: Handling Rx intr\n", pi->port.line);
@@ -1178,7 +1180,6 @@ static void
 mpsc_shutdown(struct uart_port *port)
 {
        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
-        static void mpsc_release_port(struct uart_port *port);
        pr_debug("mpsc_shutdown[%d]: Shutting down MPSC\n", port->line);
@@ -1448,7 +1449,6 @@ mpsc_console_setup(struct console *co, char *options)
        return uart_set_options(&pi->port, co, baud, parity, bits, flow);
 }
-extern struct uart_driver mpsc_reg;
 static struct console mpsc_console = {
        .name   = MPSC_DEV_NAME,
        .write  = mpsc_console_write,
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 5c4231ae295b..8e65206d3d76 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1071,7 +1071,7 @@ static void __init sunzilog_alloc_tables(void)
 */
 static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode)
 {
-        unsigned long mapped_addr;
+        void __iomem *mapped_addr;
        unsigned int sun4u_ino;
        struct sbus_bus *sbus = NULL;
        struct sbus_dev *sdev = NULL;
@@ -1111,9 +1111,9 @@ static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode)
                apply_fhc_ranges(central_bus->child,
                                 &zsregs[0], 1);
                apply_central_ranges(central_bus, &zsregs[0], 1);
-                mapped_addr =
+                mapped_addr = (void __iomem *)
-                        (((u64)zsregs[0].which_io)<<32UL) |
+                        ((((u64)zsregs[0].which_io)<<32UL) |
-                        ((u64)zsregs[0].phys_addr);
+                        ((u64)zsregs[0].phys_addr));
        }
        if (zilog_irq == -1) {
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index d5863b8b56ee..f2c9fa423d40 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -329,10 +329,8 @@ static IXJ *ixj_alloc()
 static void ixj_fsk_free(IXJ *j)
 {
-        if(j->fskdata != NULL) {
+        kfree(j->fskdata);
-                kfree(j->fskdata);
+        j->fskdata = NULL;
-                j->fskdata = NULL;
-        }
 }
 static void ixj_fsk_alloc(IXJ *j)
@@ -3867,13 +3865,11 @@ static int set_rec_codec(IXJ *j, int rate)
                j->rec_mode = 7;
                break;
        default:
+                kfree(j->read_buffer);
                j->rec_frame_size = 0;
                j->rec_mode = -1;
-                if (j->read_buffer) {
+                j->read_buffer = NULL;
-                        kfree(j->read_buffer);
+                j->read_buffer_size = 0;
-                        j->read_buffer = NULL;
-                        j->read_buffer_size = 0;
-                }
                retval = 1;
                break;
        }
@@ -3991,14 +3987,12 @@ static int ixj_record_start(IXJ *j)
 static void ixj_record_stop(IXJ *j)
 {
-        if(ixjdebug & 0x0002)
+        if (ixjdebug & 0x0002)
                printk("IXJ %d Stopping Record Codec %d at %ld\n", j->board, j->rec_codec, jiffies);
-        if (j->read_buffer) {
+        kfree(j->read_buffer);
-                kfree(j->read_buffer);
+        j->read_buffer = NULL;
-                j->read_buffer = NULL;
+        j->read_buffer_size = 0;
-                j->read_buffer_size = 0;
-        }
        if (j->rec_mode > -1) {
                ixj_WriteDSPCommand(0x5120, j);
                j->rec_mode = -1;
@@ -4449,13 +4443,11 @@ static int set_play_codec(IXJ *j, int rate)
                j->play_mode = 5;
                break;
        default:
+                kfree(j->write_buffer);
                j->play_frame_size = 0;
                j->play_mode = -1;
-                if (j->write_buffer) {
+                j->write_buffer = NULL;
-                        kfree(j->write_buffer);
+                j->write_buffer_size = 0;
-                        j->write_buffer = NULL;
-                        j->write_buffer_size = 0;
-                }
                retval = 1;
                break;
        }
@@ -4578,14 +4570,12 @@ static int ixj_play_start(IXJ *j)
 static void ixj_play_stop(IXJ *j)
 {
-        if(ixjdebug & 0x0002)
+        if (ixjdebug & 0x0002)
                printk("IXJ %d Stopping Play Codec %d at %ld\n", j->board, j->play_codec, jiffies);
-        if (j->write_buffer) {
+        kfree(j->write_buffer);
-                kfree(j->write_buffer);
+        j->write_buffer = NULL;
-                j->write_buffer = NULL;
+        j->write_buffer_size = 0;
-                j->write_buffer_size = 0;
-        }
        if (j->play_mode > -1) {
                ixj_WriteDSPCommand(0x5221, j); /* Stop playback and flush buffers.  8022 reference page 9-40 */
@@ -5810,9 +5800,7 @@ static void ixj_cpt_stop(IXJ *j)
                ixj_play_tone(j, 0);
                j->tone_state = j->tone_cadence_state = 0;
                if (j->cadence_t) {
-                        if (j->cadence_t->ce) {
+                        kfree(j->cadence_t->ce);
-                                kfree(j->cadence_t->ce);
-                        }
                        kfree(j->cadence_t);
                        j->cadence_t = NULL;
                }
@@ -7497,10 +7485,8 @@ static void cleanup(void)
                                        printk(KERN_INFO "IXJ: Releasing XILINX address for /dev/phone%d\n", cnt);
                                release_region(j->XILINXbase, 4);
                        }
-                        if (j->read_buffer)
+                        kfree(j->read_buffer);
-                                kfree(j->read_buffer);
+                        kfree(j->write_buffer);
-                        if (j->write_buffer)
-                                kfree(j->write_buffer);
                        if (j->dev)
                                pnp_device_detach(j->dev);
                        if (ixjdebug & 0x0002)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index d2d648ee8640..a8d879a85d04 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2808,7 +2808,7 @@ static int hub_thread(void *__unused)
        do {
                hub_events();
                wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list)); 
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
        } while (!signal_pending(current));
        pr_debug ("%s: khubd exiting\n", usbcore_name);
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 037a7f163822..a9be85103d23 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -1554,8 +1554,7 @@ static int sleep_thread(struct fsg_dev *fsg)
        rc = wait_event_interruptible(fsg->thread_wqh,
                        fsg->thread_wakeup_needed);
        fsg->thread_wakeup_needed = 0;
-        if (current->flags & PF_FREEZE)
+        try_to_freeze();
-                refrigerator(PF_FREEZE);
        return (rc ? -EINTR : 0);
 }
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 35c1ca6b5a8e..77e7fc258aa2 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -847,10 +847,8 @@ retry:
                wait_event_interruptible_timeout(us->delay_wait,
                                test_bit(US_FLIDX_DISCONNECTING, &us->flags),
                                delay_use * HZ);
-                if (current->flags & PF_FREEZE) {
+                if (try_to_freeze())
-                        refrigerator(PF_FREEZE);
                        goto retry;
-                }
        }
        /* If the device is still connected, perform the scanning */
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index cacd88cc84ab..b6fe30c3ad62 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -111,15 +111,15 @@ static int au1100fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
 void au1100_nocursor(struct display *p, int mode, int xx, int yy){};
 static struct fb_ops au1100fb_ops = {
-        owner:          THIS_MODULE,
+        .owner          = THIS_MODULE,
-        fb_get_fix:     fbgen_get_fix,
+        .fb_get_fix     = fbgen_get_fix,
-        fb_get_var:     fbgen_get_var,
+        .fb_get_var     = fbgen_get_var,
-        fb_set_var:     fbgen_set_var,
+        .fb_set_var     = fbgen_set_var,
-        fb_get_cmap:    fbgen_get_cmap,
+        .fb_get_cmap    = fbgen_get_cmap,
-        fb_set_cmap:    fbgen_set_cmap,
+        .fb_set_cmap    = fbgen_set_cmap,
-        fb_pan_display: fbgen_pan_display,
+        .fb_pan_display = fbgen_pan_display,
-        fb_ioctl:       au1100fb_ioctl,
+        .fb_ioctl       = au1100fb_ioctl,
-        fb_mmap:        au1100fb_mmap,
+        .fb_mmap        = au1100fb_mmap,
 };
 static void au1100_detect(void)
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index e4b91a4b936c..cbff98337aa6 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -156,7 +156,6 @@ config FONT_6x11
 config FONT_7x14
        bool "console 7x14 font (not supported by all drivers)" if FONTS
        depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS
        help
          Console font with characters just a bit smaller than the default.
          If the standard 8x16 font is a little too big for you, say Y.
@@ -197,8 +196,8 @@ config FONT_SUN12x22
          standard font is unreadable for you, say Y, otherwise say N.
 config FONT_10x18
-        bool "console 10x18 font (not supported by all drivers)"
+        bool "console 10x18 font (not supported by all drivers)" if FONTS
-        depends on FONTS
+        depends on FRAMEBUFFER_CONSOLE
        help
          This is a high resolution console font for machines with very
          big letters. It fits between the sun 12x22 and the normal 8x16 font.
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 277d733c6d00..7dfbf39b4ed3 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -228,8 +228,6 @@ static ssize_t store_virtual(struct class_device *class_device,
        if (last - buf >= count)
                return -EINVAL;
        var.yres_virtual = simple_strtoul(last, &last, 0);
-        printk(KERN_ERR "fb: xres %d yres %d\n", var.xres_virtual,
-               var.yres_virtual);
        if ((err = activate(fb_info, &var)))
                return err;
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index 76fd3a519b8a..a18dd024fc86 100644
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -197,10 +197,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
        DBG(__FUNCTION__)
        hw->SEQ[0] = 0x00;
-        if (fwidth == 9)
+        hw->SEQ[1] = 0x01;      /* or 0x09 */
-                hw->SEQ[1] = 0x00;
-        else
-                hw->SEQ[1] = 0x01;      /* or 0x09 */
        hw->SEQ[2] = 0x0F;      /* bitplanes */
        hw->SEQ[3] = 0x00;
        hw->SEQ[4] = 0x0E;
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index f3069b01e248..9ed1a931dd31 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -389,10 +389,11 @@ static int __init vesafb_probe(struct device *device)
                unsigned int temp_size = size_total;
                /* Find the largest power-of-two */
                while (temp_size & (temp_size - 1))
-                        temp_size &= (temp_size - 1);
+                        temp_size &= (temp_size - 1);
-                        
-                /* Try and find a power of two to add */
+                /* Try and find a power of two to add */
-                while (temp_size && mtrr_add(vesafb_fix.smem_start, temp_size, MTRR_TYPE_WRCOMB, 1)==-EINVAL) {
+                while (temp_size > PAGE_SIZE &&
+                        mtrr_add(vesafb_fix.smem_start, temp_size, MTRR_TYPE_WRCOMB, 1)==-EINVAL) {
                        temp_size >>= 1;
                }
        }
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index b460927ec32a..312cf3220f12 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -646,7 +646,7 @@ static int w1_control(void *data)
        while (!control_needs_exit || have_to_wait) {
                have_to_wait = 0;
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
                msleep_interruptible(w1_timeout * 1000);
                if (signal_pending(current))
@@ -725,7 +725,7 @@ int w1_process(void *data)
        allow_signal(SIGTERM);
        while (!test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
-                try_to_freeze(PF_FREEZE);
+                try_to_freeze();
                msleep_interruptible(w1_timeout * 1000);
                if (signal_pending(current))