diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 09:31:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 09:31:42 -0800 |
| commit | dde0013782dbd09e1cc68ca03860f3a62b03cb34 (patch) | |
| tree | 5be40012944c0fab834a385f2410eaa60e2b0d6e /kernel | |
| parent | f3aafa6c2535d36542a6dfc8647cd2fdb5999648 (diff) | |
| parent | a99824f327c748b2753f4fa570eb1fefcd6a9c4d (diff) | |
| download | linux-dde0013782dbd09e1cc68ca03860f3a62b03cb34.tar.gz linux-dde0013782dbd09e1cc68ca03860f3a62b03cb34.tar.bz2 linux-dde0013782dbd09e1cc68ca03860f3a62b03cb34.zip | |
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Add arch-specific walk_memory_remove() for 64-bit powerpc
[POWERPC] Enable hotplug memory remove for 64-bit powerpc
[POWERPC] Add remove_memory() for 64-bit powerpc
[POWERPC] Make cell IOMMU fixed mapping printk more useful
[POWERPC] Fix potential cell IOMMU bug when switching back to default DMA ops
[POWERPC] Don't enable cell IOMMU fixed mapping if there are no dma-ranges
[POWERPC] Fix cell IOMMU null pointer explosion on old firmwares
[POWERPC] spufs: Fix timing dependent false return from spufs_run_spu
[POWERPC] spufs: No need to have a runnable SPU for libassist update
[POWERPC] spufs: Update SPU_Status[CISHP] in backing runcntl write
[POWERPC] spufs: Fix state_mutex leaks
[POWERPC] Disable G5 NAP mode during SMU commands on U3
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 2eb553d9b517..82aea814d409 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -228,7 +228,7 @@ int release_resource(struct resource *old) EXPORT_SYMBOL(release_resource); -#ifdef CONFIG_MEMORY_HOTPLUG +#if defined(CONFIG_MEMORY_HOTPLUG) && !defined(CONFIG_ARCH_HAS_WALK_MEMORY) /* * Finds the lowest memory reosurce exists within [res->start.res->end) * the caller must specify res->start, res->end, res->flags. |