1. 17 Jul, 2008 3 commits
    • Roland McGrath's avatar
      do_wait reorganization · 98abed02
      Roland McGrath authored
      This breaks out the guts of do_wait into three subfunctions.
      The control flow is less nonobvious without so much goto.
      do_wait_thread and ptrace_do_wait contain the main work of the outer loop.
      wait_consider_task contains the main work of the inner loop.
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      98abed02
    • Chandra Seetharaman's avatar
      scsi_dh: Verify "dev" is a sdev before accessing it. · 33af79d1
      Chandra Seetharaman authored
      Before accessing the device data structure in hardware handlers,
      make sure it is a indeed a sdev device.
      
      Yinghai Lu <yhlu.kernel@gmail.com> found the bug on Jul 16, 2008,
      and later tested/verified the following fix.
      Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      33af79d1
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · dc7c65db
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits)
        Revert "x86/PCI: ACPI based PCI gap calculation"
        PCI: remove unnecessary volatile in PCIe hotplug struct controller
        x86/PCI: ACPI based PCI gap calculation
        PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
        PCI PM: Fix pci_prepare_to_sleep
        x86/PCI: Fix PCI config space for domains > 0
        Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n
        PCI: Simplify PCI device PM code
        PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep
        PCI ACPI: Rework PCI handling of wake-up
        ACPI: Introduce new device wakeup flag 'prepared'
        ACPI: Introduce acpi_device_sleep_wake function
        PCI: rework pci_set_power_state function to call platform first
        PCI: Introduce platform_pci_power_manageable function
        ACPI: Introduce acpi_bus_power_manageable function
        PCI: make pci_name use dev_name
        PCI: handle pci_name() being const
        PCI: add stub for pci_set_consistent_dma_mask()
        PCI: remove unused arch pcibios_update_resource() functions
        PCI: fix pci_setup_device()'s sprinting into a const buffer
        ...
      
      Fixed up conflicts in various files (arch/x86/kernel/setup_64.c,
      arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c,
      drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86
      and ACPI updates manually.
      dc7c65db
  2. 16 Jul, 2008 37 commits