1. 21 Dec, 2011 7 commits
    • Rafael J. Wysocki's avatar
      PM: Run the driver callback directly if the subsystem one is not there · 35cd133c
      Rafael J. Wysocki authored
      Make the PM core execute driver PM callbacks directly if the
      corresponding subsystem callbacks are not present.
      
      There are three reasons for doing that.  First, it reflects the
      behavior of drivers/base/dd.c:really_probe() that runs the driver's
      .probe() callback directly if the bus type's one is not defined, so
      this change will remove one arbitrary difference between the PM core
      and the remaining parts of the driver core.  Second, it will allow
      some subsystems, whose PM callbacks don't do anything except for
      executing driver callbacks, to be simplified quite a bit by removing
      those "forward-only" callbacks.  Finally, it will allow us to remove
      one level of indirection in the system suspend and resume code paths
      where it is not necessary, which is going to lead to less debug noise
      with initcall_debug passed in the kernel command line (messages won't
      be printed for driverless devices whose subsystems don't provide
      PM callbacks among other things).
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      35cd133c
    • Rafael J. Wysocki's avatar
      PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers · 9cf519d1
      Rafael J. Wysocki authored
      Make the pm_op() and pm_noirq_op() functions return pointers to
      appropriate callbacks instead of executing those callbacks and
      returning their results.
      
      This change is required for a subsequent modification that will
      execute the corresponding driver callback if the subsystem
      callback returned by either pm_op(), or pm_noirq_op() is NULL.
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      9cf519d1
    • Rafael J. Wysocki's avatar
      Merge branch 'master' into pm-sleep · b00f4dc5
      Rafael J. Wysocki authored
      * master: (848 commits)
        SELinux: Fix RCU deref check warning in sel_netport_insert()
        binary_sysctl(): fix memory leak
        mm/vmalloc.c: remove static declaration of va from __get_vm_area_node
        ipmi_watchdog: restore settings when BMC reset
        oom: fix integer overflow of points in oom_badness
        memcg: keep root group unchanged if creation fails
        nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()
        nilfs2: unbreak compat ioctl
        cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
        evm: prevent racing during tfm allocation
        evm: key must be set once during initialization
        mmc: vub300: fix type of firmware_rom_wait_states module parameter
        Revert "mmc: enable runtime PM by default"
        mmc: sdhci: remove "state" argument from sdhci_suspend_host
        x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT
        IB/qib: Correct sense on freectxts increment and decrement
        RDMA/cma: Verify private data length
        cgroups: fix a css_set not found bug in cgroup_attach_proc
        oprofile: Fix uninitialized memory access when writing to writing to oprofilefs
        Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
        ...
      
      Conflicts:
      	kernel/cgroup_freezer.c
      b00f4dc5
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · b9e26dfd
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6:
        mtd: plat_ram: call mtd_device_register only if partition data exists
        mtd: pxa2xx-flash.c: It used to fall back to provided table.
        mtd: gpmi: add missing include 'module.h'
        mtd: ndfc: fix typo in structure dereference
      b9e26dfd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 11da3764
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
        mmc: vub300: fix type of firmware_rom_wait_states module parameter
        Revert "mmc: enable runtime PM by default"
        mmc: sdhci: remove "state" argument from sdhci_suspend_host
      11da3764
    • David Howells's avatar
      SELinux: Fix RCU deref check warning in sel_netport_insert() · 50345f1e
      David Howells authored
      Fix the following bug in sel_netport_insert() where rcu_dereference() should
      be rcu_dereference_protected() as sel_netport_lock is held.
      
      ===================================================
      [ INFO: suspicious rcu_dereference_check() usage. ]
      ---------------------------------------------------
      security/selinux/netport.c:127 invoked rcu_dereference_check() without protection!
      
      other info that might help us debug this:
      
      rcu_scheduler_active = 1, debug_locks = 0
      1 lock held by ossec-rootcheck/3323:
       #0:  (sel_netport_lock){+.....}, at: [<ffffffff8117d775>] sel_netport_sid+0xbb/0x226
      
      stack backtrace:
      Pid: 3323, comm: ossec-rootcheck Not tainted 3.1.0-rc8-fsdevel+ #1095
      Call Trace:
       [<ffffffff8105cfb7>] lockdep_rcu_dereference+0xa7/0xb0
       [<ffffffff8117d871>] sel_netport_sid+0x1b7/0x226
       [<ffffffff8117d6ba>] ? sel_netport_avc_callback+0xbc/0xbc
       [<ffffffff8117556c>] selinux_socket_bind+0x115/0x230
       [<ffffffff810a5388>] ? might_fault+0x4e/0x9e
       [<ffffffff810a53d1>] ? might_fault+0x97/0x9e
       [<ffffffff81171cf4>] security_socket_bind+0x11/0x13
       [<ffffffff812ba967>] sys_bind+0x56/0x95
       [<ffffffff81380dac>] ? sysret_check+0x27/0x62
       [<ffffffff8105b767>] ? trace_hardirqs_on_caller+0x11e/0x155
       [<ffffffff81076fcd>] ? audit_syscall_entry+0x17b/0x1ae
       [<ffffffff811b5eae>] ? trace_hardirqs_on_thunk+0x3a/0x3f
       [<ffffffff81380d7b>] system_call_fastpath+0x16/0x1b
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarPaul Moore <paul@paul-moore.com>
      Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJames Morris <jmorris@namei.org>
      50345f1e
    • James Morris's avatar
      Merge branch 'evm-fixes' of... · 428f3281
      James Morris authored
      Merge branch 'evm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kasatkin/linux-digsig into for-linus
      428f3281
  2. 20 Dec, 2011 20 commits
  3. 19 Dec, 2011 13 commits