← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to drivers/input/serio/i8042-x86ia64io.h

  • 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/input/serio/i8042-x86ia64io.h
921
921
        int retval;
922
922
 
923
923
#ifdef CONFIG_X86
 
924
        u8 a20_on = 0xdf;
924
925
        /* Just return if pre-detection shows no i8042 controller exist */
925
926
        if (!x86_platform.i8042_detect())
926
927
                return -ENODEV;
960
961
 
961
962
        if (dmi_check_system(i8042_dmi_dritek_table))
962
963
                i8042_dritek = true;
 
964
 
 
965
        /*
 
966
         * A20 was already enabled during early kernel init. But some buggy
 
967
         * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
 
968
         * resume from S3. So we do it here and hope that nothing breaks.
 
969
         */
 
970
        i8042_command(&a20_on, 0x10d1);
 
971
        i8042_command(NULL, 0x00ff);    /* Null command for SMM firmware */
963
972
#endif /* CONFIG_X86 */
964
973
 
965
974
        return retval;