diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-27 09:20:30 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-27 21:25:26 +0200 |
commit | 4f8ee2c9cc0e885d2bb50ef26db66150ab25213e (patch) | |
tree | e60a5f629efa6637a626374f8232abc0c645e332 /lib/lmb.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
download | linux-4f8ee2c9cc0e885d2bb50ef26db66150ab25213e.tar.xz linux-4f8ee2c9cc0e885d2bb50ef26db66150ab25213e.zip |
lmb: Remove __init from lmb_end_of_DRAM()
We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
without IOMMU, but this function is marked as __init.
I don't think there's a clean way to get the top of RAM max_pfn doesn't
appear to include highmem or I missed (or we have a bug :-) so for now,
let's just avoid having a broken 2.6.31 by making this function
non-__init and we can revisit later.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/lmb.c')
-rw-r--r-- | lib/lmb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/lmb.c b/lib/lmb.c index e4a6482d8b26..0343c05609f0 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void) return lmb.memory.size; } -u64 __init lmb_end_of_DRAM(void) +u64 lmb_end_of_DRAM(void) { int idx = lmb.memory.cnt - 1; |