1. 14 Jun, 2009 2 commits
  2. 13 Jun, 2009 27 commits
  3. 12 Jun, 2009 11 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 947ec0b0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM: Add empty suspend/resume device irq functions
        PM/Hibernate: Move NVS routines into a seperate file (v2).
        PM/Hibernate: Rename disk.c to hibernate.c
        PM: Separate suspend to RAM functionality from core
        Driver Core: Rework platform suspend/resume, print warning
        PM: Remove device_type suspend()/resume()
        PM/Hibernate: Move memory shrinking to snapshot.c (rev. 2)
        PM/Suspend: Do not shrink memory before suspend
        PM: Remove bus_type suspend_late()/resume_early() V2
        PM core: rename suspend and resume functions
        PM: Rename device_power_down/up()
        PM: Remove unused asm/suspend.h
        x86: unify power/cpu_(32|64).c
        x86: unify power/cpu_(32|64) copyright notes
        x86: unify power/cpu_(32|64) regarding restoring processor state
        x86: unify power/cpu_(32|64) regarding saving processor state
        x86: unify power/cpu_(32|64) global variables
        x86: unify power/cpu_(32|64) headers
        PM: Warn if interrupts are enabled during suspend-resume of sysdevs
        PM/ACPI/x86: Fix sparse warning in arch/x86/kernel/acpi/sleep.c
      947ec0b0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · c53567ad
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: use more NOFS allocation
        dlm: connect to nodes earlier
        dlm: fix use count with multiple joins
        dlm: Make name input parameter of {,dlm_}new_lockspace() const
      c53567ad
    • Linus Torvalds's avatar
      Merge branch 'perfcounters-fixes-for-linus' of... · 4ddbac98
      Linus Torvalds authored
      Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf_counter: Start documenting HAVE_PERF_COUNTERS requirements
        perf_counter: Add forward/backward attribute ABI compatibility
        perf record: Explicity program a default counter
        perf_counter: Remove PERF_TYPE_RAW special casing
        perf_counter: PERF_TYPE_HW_CACHE is a hardware counter too
        powerpc, perf_counter: Fix performance counter event types
        perf_counter/x86: Add a quirk for Atom processors
        perf_counter tools: Remove one L1-data alias
      4ddbac98
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 02a99ed6
      Linus Torvalds authored
      * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (55 commits)
        microblaze: Don't use access_ok for unaligned
        microblaze: remove unused flat_stack_align() definition
        microblaze: Fix problem with early_printk in startup
        microblaze_mmu_v2: Makefiles
        microblaze_mmu_v2: Kconfig update
        microblaze_mmu_v2: stat.h MMU update
        microblaze_mmu_v2: Elf update
        microblaze_mmu_v2: Update dma.h for MMU
        microblaze_mmu_v2: Update cacheflush.h
        microblaze_mmu_v2: Update signal returning address
        microblaze_mmu_v2: Traps MMU update
        microblaze_mmu_v2: Enable fork syscall for MMU and add fork as vfork for noMMU
        microblaze_mmu_v2: Update linker script for MMU
        microblaze_mmu_v2: Add MMU related exceptions handling
        microblaze_mmu_v2: uaccess MMU update
        microblaze_mmu_v2: Update exception handling - MMU exception
        microblaze_mmu_v2: entry.S, entry.h
        microblaze_mmu_v2: Add CURRENT_TASK for entry.S
        microblaze_mmu_v2: MMU asm offset update
        microblaze_mmu_v2: Update tlb.h and tlbflush.h
        ...
      02a99ed6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 2b10dc45
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (62 commits)
        Blackfin: fix sparseirq/kstat_irqs fallout
        Blackfin: fix unused warnings after nommu update
        Blackfin: export the last exception cause via debugfs
        Blackfin: fix length checking in kgdb_ebin2mem
        Blackfin: kgdb: fix up error return values
        Blackfin: push access_ok() L1 attribute down
        Blackfin: punt duplicated search_exception_table() prototype
        Blackfin: add missing access_ok() checks to user functions
        Blackfin: convert early_printk EVT init to a loop
        Blackfin: document the lsl variants of the L1 allocator
        Blackfin: rename Blackfin relocs according to the toolchain
        Blackfin: check SIC defines rather than variant names
        Blackfin: add SSYNC to set_dma_sg() for descriptor fetching
        Blackfin: convert SMP to only use generic time framework
        Blackfin: bf548-ezkit/bf537-stamp: add resources for ADXL345/346
        Blackfin: override default uClinux MTD addr/size
        Blackfin: fix command line corruption with DEBUG_DOUBLEFAULT
        Blackfin: fix handling of initial L1 reservation
        Blackfin: merge sram init functions
        Blackfin: drop unused reserve_pda() function
        ...
      2b10dc45
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://linux-arm.org/linux-2.6 · 47ea421a
      Linus Torvalds authored
      * 'for-linus' of git://linux-arm.org/linux-2.6:
        kmemleak: Add more info to the MAINTAINERS entry
        kmemleak: Remove the kmemleak.h include in drivers/char/vt.c
      47ea421a
    • Heiko Carstens's avatar
      PM: Add empty suspend/resume device irq functions · 5818a6e2
      Heiko Carstens authored
      git commit 0a0c5168
      
       "PM: Introduce functions for suspending and resuming
      device interrupts" introduced some helper functions. However these
      functions are only available for architectures which support
      GENERIC_HARDIRQS.
      
      Other architectures will see this build error:
      
      drivers/built-in.o: In function `sysdev_suspend':
      (.text+0x15138): undefined reference to `check_wakeup_irqs'
      drivers/built-in.o: In function `device_power_up':
      (.text+0x1cb66): undefined reference to `resume_device_irqs'
      drivers/built-in.o: In function `device_power_down':
      (.text+0x1cb92): undefined reference to `suspend_device_irqs'
      
      To fix this add some empty inline functions for !GENERIC_HARDIRQS.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      5818a6e2
    • Cornelia Huck's avatar
      PM/Hibernate: Move NVS routines into a seperate file (v2). · fce2b111
      Cornelia Huck authored
      
      
      The *_nvs_* routines in swsusp.c make use of the io*map()
      functions, which are only provided for HAS_IOMEM, thus
      breaking compilation if HAS_IOMEM is not set. Fix this
      by moving the *_nvs_* routines into hibernate_nvs.c, which
      is only compiled if HAS_IOMEM is set.
      
      [rjw: Change the name of the new file to hibernate_nvs.c, add the
       license line to the header comment.]
      Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      fce2b111
    • Rafael J. Wysocki's avatar
      PM/Hibernate: Rename disk.c to hibernate.c · 8b759b84
      Rafael J. Wysocki authored
      
      
      Change the name of kernel/power/disk.c to kernel/power/hibernate.c
      in analogy with the file names introduced by the changes that
      separated the suspend to RAM and standby funtionality from the
      common PM functions.
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      8b759b84
    • Rafael J. Wysocki's avatar
      PM: Separate suspend to RAM functionality from core · a9d70523
      Rafael J. Wysocki authored
      
      
      Move the suspend to RAM and standby code from kernel/power/main.c
      to two separate files, kernel/power/suspend.c containing the basic
      functions and kernel/power/suspend_test.c containing the automatic
      suspend test facility based on the RTC clock alarm.
      
      There are no changes in functionality related to these modifications.
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      a9d70523
    • Magnus Damm's avatar
      Driver Core: Rework platform suspend/resume, print warning · 783ea7d4
      Magnus Damm authored
      
      
      This patch reworks the platform driver code for legacy
      suspend and resume to avoid installing callbacks in
      struct device_driver. A warning is also added telling
      users to update the platform driver to use dev_pm_ops.
      
      The functions platform_legacy_suspend()/resume() directly
      call suspend and resume callbacks in struct platform_driver
      instead of wrapping things in platform_drv_suspend()/resume().
      Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
      Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      783ea7d4