source "drivers/virt/Kconfig"
+ source "drivers/hv/Kconfig"
+
+source "drivers/devfreq/Kconfig"
+
endmenu
# Virtualization drivers
obj-$(CONFIG_VIRT_DRIVERS) += virt/
+ obj-$(CONFIG_HYPERV) += hv/
+obj-$(CONFIG_PM_DEVFREQ) += devfreq/
#include <linux/string.h>
#include <linux/firmware.h>
#include <linux/slab.h>
-#include "altera.h"
+ #include <linux/module.h>
+#include <misc/altera.h>
#include "altera-exprt.h"
#include "altera-jtag.h"
* returned by pci_map_page() is always 32-bit
* addressable (as defined by the pci/dma subsystem)
*/
- desc[frag++].addr_lo =
- pci_map_page(adapter->pdev,
- frags[i - 1].page,
- frags[i - 1].page_offset,
- frags[i - 1].size,
- PCI_DMA_TODEVICE);
+ desc[frag++].addr_lo = skb_frag_dma_map(
- &etdev->pdev->dev,
++ &adapter->pdev->dev,
+ &frags[i - 1],
+ 0,
+ frags[i - 1].size,
+ DMA_TO_DEVICE);
}
}
- obj-$(CONFIG_HYPERV) += hv_vmbus.o
-obj-$(CONFIG_HYPERV) += hv_timesource.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
- obj-$(CONFIG_HYPERV_BLOCK) += hv_blkvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
- obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
obj-$(CONFIG_HYPERV_MOUSE) += hv_mouse.o
- hv_vmbus-y := vmbus_drv.o \
- hv.o connection.o channel.o \
- channel_mgmt.o ring_buffer.o
- hv_storvsc-y := storvsc_drv.o storvsc.o
- hv_blkvsc-y := blkvsc_drv.o storvsc.o
+ hv_storvsc-y := storvsc_drv.o
hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
- hv_utils-y := hv_util.o hv_kvp.o
return 0;
}
- #ifdef XGIFB_PAN
-static int XGIfb_pan_var(struct fb_var_screeninfo *var)
+static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
{
unsigned int base;
}
__zram_make_request(zram, bio, bio_data_dir(bio));
- return 0;
+ up_read(&zram->init_lock);
+
- return 0;
++ return;
+
+ error_unlock:
+ up_read(&zram->init_lock);
+ error:
+ bio_io_error(bio);
}
- void zram_reset_device(struct zram *zram)
+ void __zram_reset_device(struct zram *zram)
{
size_t index;