← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to drivers/infiniband/hw/nes/nes_hw.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-25.38
  • Date: 2013-02-20 22:03:31 UTC
  • mfrom: (74.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130220220331-0ea4l33x3cr61nch
Tags: 3.5.0-220.28
https://launchpad.net/bugs/1130311
https://launchpad.net/bugs/1129472
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
* Release Tracking Bug
  - LP: #1130311

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-25.38

[ Ubuntu: 3.5.0-25.38 ]

* Release Tracking Bug
  - LP: #1129472
* ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
  - LP: #1119885, #1129192
  - CVE-2013-0871
* ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
  - LP: #1119885, #1129192
  - CVE-2013-0871
* wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED
  task
  - LP: #1119885, #1129192
  - CVE-2013-0871

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/infiniband/hw/nes/nes_hw.c
75
75
static void process_critical_error(struct nes_device *nesdev);
76
76
static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number);
77
77
static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_Mode);
78
 
static void nes_terminate_timeout(unsigned long context);
79
78
static void nes_terminate_start_timer(struct nes_qp *nesqp);
80
79
 
81
80
#ifdef CONFIG_INFINIBAND_NES_DEBUG
3522
3521
}
3523
3522
 
3524
3523
/* Timeout routine in case terminate fails to complete */
3525
 
static void nes_terminate_timeout(unsigned long context)
 
3524
void nes_terminate_timeout(unsigned long context)
3526
3525
{
3527
3526
        struct nes_qp *nesqp = (struct nes_qp *)(unsigned long)context;
3528
3527
 
3532
3531
/* Set a timer in case hw cannot complete the terminate sequence */
3533
3532
static void nes_terminate_start_timer(struct nes_qp *nesqp)
3534
3533
{
3535
 
        init_timer(&nesqp->terminate_timer);
3536
 
        nesqp->terminate_timer.function = nes_terminate_timeout;
3537
 
        nesqp->terminate_timer.expires = jiffies + HZ;
3538
 
        nesqp->terminate_timer.data = (unsigned long)nesqp;
3539
 
        add_timer(&nesqp->terminate_timer);
 
3534
        mod_timer(&nesqp->terminate_timer, (jiffies + HZ));
3540
3535
}
3541
3536
 
3542
3537
/**