Per Andi Kleen's suggestion in the review of our Calgary IOMMU code, I
tried to use the alloc_bootmem_nopanic when allocing bootmem.
Unfortunately, it needs low mem for our translation tables, so we needed
a new function to do this.
I have updated swiotlb to take advantage of this new function in the
patch following this one.
This patch has been tested individually and cumulatively on x86_64 and
cross-compile tested on IA64. Since I have no IA64 hardware, any
testing on that platform would be appreciated.
Thanks,
Jon
Signed-off-by: Jon Mason <[email protected]>
diff -r 235bc05ff8b1 -r 9459ba92585b include/linux/bootmem.h
--- a/include/linux/bootmem.h Mon May 8 16:17:49 2006
+++ b/include/linux/bootmem.h Mon May 8 16:30:29 2006
@@ -54,6 +54,9 @@
extern void * __init __alloc_bootmem_low(unsigned long size,
unsigned long align,
unsigned long goal);
+extern void * __init __alloc_bootmem_low_nopanic(unsigned long size,
+ unsigned long align,
+ unsigned long goal);
extern void * __init __alloc_bootmem_low_node(pg_data_t *pgdat,
unsigned long size,
unsigned long align,
diff -r 235bc05ff8b1 -r 9459ba92585b mm/bootmem.c
--- a/mm/bootmem.c Mon May 8 16:17:49 2006
+++ b/mm/bootmem.c Mon May 8 16:30:29 2006
@@ -473,3 +473,16 @@
{
return __alloc_bootmem_core(pgdat->bdata, size, align, goal, LOW32LIMIT);
}
+
+void * __init __alloc_bootmem_low_nopanic(unsigned long size,
+ unsigned long align, unsigned long goal)
+{
+ bootmem_data_t *bdata;
+ void *ptr;
+
+ list_for_each_entry(bdata, &bdata_list, list)
+ if ((ptr = __alloc_bootmem_core(bdata, size, align, goal,
+ LOW32LIMIT)))
+ return ptr;
+ return NULL;
+}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
