diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 12:49:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 12:49:27 -0400 |
| commit | 0d8762c9ee40cf83d5dbf3a22843bc566912b592 (patch) | |
| tree | d3ae691a55226e3671caa1f837e127693f6742e8 /kernel/resource.c | |
| parent | cf76dddb22c019f03ada6479210f894f19bd591b (diff) | |
| parent | 6afe40b4dace385d7ba2faf24b352f066f3b71bf (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: fix irqs on/off ip tracing
lockdep: minor fix for debug_show_all_locks()
x86: restore the old swiotlb alloc_coherent behavior
x86: use GFP_DMA for 24bit coherent_dma_mask
swiotlb: remove panic for alloc_coherent failure
xen: compilation fix of drivers/xen/events.c on IA64
xen: portability clean up and some minor clean up for xencomm.c
xen: don't reload cr3 on suspend
kernel/resource: fix reserve_region_with_split() section mismatch
printk: remove unused code from kernel/printk.c
Diffstat (limited to 'kernel/resource.c')
| -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 4089d12af6e0..7fec0e427234 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
| @@ -571,7 +571,7 @@ static void __init __reserve_region_with_split(struct resource *root, | |||
| 571 | 571 | ||
| 572 | } | 572 | } |
| 573 | 573 | ||
| 574 | void reserve_region_with_split(struct resource *root, | 574 | void __init reserve_region_with_split(struct resource *root, |
| 575 | resource_size_t start, resource_size_t end, | 575 | resource_size_t start, resource_size_t end, |
| 576 | const char *name) | 576 | const char *name) |
| 577 | { | 577 | { |