lkml.org 
[lkml]   [2005]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH -rt] convert compat sem in block device sx8
    From
    Date
    On Fri, 2005-11-25 at 17:50 -0500, Steven Rostedt wrote:
    > Ingo,
    >
    > I decided to add a few more conversions to the list :-)
    >
    > Here's sx8. Unfortunately, I was only able to test compiling it, since I
    > don't have the hardware. Hence, I'm not sending this to mainline unless
    > someone can test it on yours. (your patch is the new -mm ;-)
    >

    Ack! I sent this after making a small change and never refreshing
    quilt. So this would not even compile!

    Here's the fixed patch:

    -- Steve

    Index: linux-2.6.14-rt15/drivers/block/sx8.c
    ===================================================================
    --- linux-2.6.14-rt15.orig/drivers/block/sx8.c 2005-11-25 10:14:09.000000000 -0500
    +++ linux-2.6.14-rt15/drivers/block/sx8.c 2005-11-25 17:39:12.000000000 -0500
    @@ -27,6 +27,7 @@
    #include <linux/time.h>
    #include <linux/hdreg.h>
    #include <linux/dma-mapping.h>
    +#include <linux/completion.h>
    #include <asm/io.h>
    #include <asm/semaphore.h>
    #include <asm/uaccess.h>
    @@ -280,10 +281,7 @@

    struct work_struct fsm_task;

    - /*
    - * PREEMPT_RT: should be converted to completions.
    - */
    - struct compat_semaphore probe_sem;
    + struct completion probe_comp;
    };

    struct carm_response {
    @@ -1345,7 +1343,7 @@
    }

    case HST_PROBE_FINISHED:
    - up(&host->probe_sem);
    + complete(&host->probe_comp);
    break;

    case HST_ERROR:
    @@ -1621,7 +1619,7 @@
    host->flags = pci_dac ? FL_DAC : 0;
    spin_lock_init(&host->lock);
    INIT_WORK(&host->fsm_task, carm_fsm_task, host);
    - init_MUTEX_LOCKED(&host->probe_sem);
    + init_completion(&host->probe_comp);

    for (i = 0; i < ARRAY_SIZE(host->req); i++)
    host->req[i].tag = i;
    @@ -1690,8 +1688,8 @@
    if (rc)
    goto err_out_free_irq;

    - DPRINTK("waiting for probe_sem\n");
    - down(&host->probe_sem);
    + DPRINTK("waiting for probe_comp\n");
    + wait_for_completion(&host->probe_comp);

    printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
    host->name, pci_name(pdev), (int) CARM_MAX_PORTS,

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-11-26 00:00    [W:0.034 / U:31.456 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site