← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/x86/kernel/hpet.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:
arch/x86/kernel/hpet.c
434
434
 
435
435
        /* unmask it */
436
436
        cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
437
 
        cfg |= HPET_TN_FSB;
 
437
        cfg |= HPET_TN_ENABLE | HPET_TN_FSB;
438
438
        hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
439
439
}
440
440
 
445
445
 
446
446
        /* mask it */
447
447
        cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
448
 
        cfg &= ~HPET_TN_FSB;
 
448
        cfg &= ~(HPET_TN_ENABLE | HPET_TN_FSB);
449
449
        hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
450
450
}
451
451