Title: [9721] trunk: nommu: vcoalesce: rename from vmap as this is the direction mainline is going
- Revision
- 9721
- Author
- vapier
- Date
- 2011-03-17 04:53:36 -0400 (Thu, 17 Mar 2011)
Log Message
nommu: vcoalesce: rename from vmap as this is the direction mainline is going
Modified Paths
Diff
Modified: trunk/drivers/base/firmware_class.c (9720 => 9721)
--- trunk/drivers/base/firmware_class.c 2011-03-17 07:15:49 UTC (rev 9720)
+++ trunk/drivers/base/firmware_class.c 2011-03-17 08:53:36 UTC (rev 9721)
@@ -248,7 +248,7 @@
case 0:
if (test_bit(FW_STATUS_LOADING, &fw_priv->status)) {
vunmap(fw_priv->fw->data);
- fw_priv->fw->data = ""
+ fw_priv->fw->data = ""
fw_priv->nr_pages,
0, PAGE_KERNEL_RO);
if (!fw_priv->fw->data) {
Modified: trunk/include/linux/vmalloc.h (9720 => 9721)
--- trunk/include/linux/vmalloc.h 2011-03-17 07:15:49 UTC (rev 9720)
+++ trunk/include/linux/vmalloc.h 2011-03-17 08:53:36 UTC (rev 9721)
@@ -44,10 +44,13 @@
#ifdef CONFIG_MMU
extern void __init vmalloc_init(void);
+#define vcoalesce(...) vmap(...)
#else
static inline void vmalloc_init(void)
{
}
+extern void *vcoalesce(struct page **pages, unsigned int count,
+ unsigned long flags, pgprot_t prot);
#endif
extern void *vmalloc(unsigned long size);
Modified: trunk/mm/nommu.c (9720 => 9721)
--- trunk/mm/nommu.c 2011-03-17 07:15:49 UTC (rev 9720)
+++ trunk/mm/nommu.c 2011-03-17 08:53:36 UTC (rev 9721)
@@ -402,7 +402,8 @@
}
EXPORT_SYMBOL(vmalloc_32_user);
-void *vmap(struct page **pages, unsigned int count, unsigned long flags, pgprot_t prot)
+void *vcoalesce(struct page **pages, unsigned int count,
+ unsigned long flags, pgprot_t prot)
{
unsigned int i;
void *new_map, *page_data;
@@ -419,6 +420,13 @@
return new_map;
}
+EXPORT_SYMBOL(vcoalesce);
+
+void *vmap(struct page **pages, unsigned int count, unsigned long flags, pgprot_t prot)
+{
+ BUG();
+ return NULL;
+}
EXPORT_SYMBOL(vmap);
void vunmap(const void *addr)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
