mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Staging: hv: osd: remove MemAllocAtomic wrapper 

Use the "real" kmalloc call instead of a wrapper function.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-07-15 12:48:01 -07:00
parent e276a3a578
commit 0a72f3cf9f
6 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/hv/ChannelMgmt.c
View File

@ -143,13 +143,12 @@ VMBUS_CHANNEL* AllocVmbusChannel(void)
{
VMBUS_CHANNEL* channel;
channel = (VMBUS_CHANNEL*) MemAllocAtomic(sizeof(VMBUS_CHANNEL));
channel = kzalloc(sizeof(VMBUS_CHANNEL), GFP_ATOMIC);
if (!channel)
{
return NULL;
}
memset(channel, 0,sizeof(VMBUS_CHANNEL));
channel->InboundLock = SpinlockCreate();
if (!channel->InboundLock)
{

2
drivers/staging/hv/Hv.c
View File

@ -414,7 +414,7 @@ HvPostMessage(
return -1;
}
addr = (unsigned long)MemAllocAtomic(sizeof(struct alignedInput));
addr = (unsigned long)kmalloc(sizeof(struct alignedInput), GFP_ATOMIC);
if (!addr)
{

2
drivers/staging/hv/NetVsc.c
View File

@ -1480,7 +1480,7 @@ NetVscOnChannelCallback(
}
else if (ret == -2) // Handle large packet
{
buffer = MemAllocAtomic(bytesRecvd);
buffer = kmalloc(bytesRecvd, GFP_ATOMIC);
if (buffer == NULL)
{
// Try again next time around

2
drivers/staging/hv/Vmbus.c
View File

@ -411,7 +411,7 @@ VmbusOnMsgDPC(
}
else
{
copied = MemAllocAtomic(sizeof(HV_MESSAGE));
copied = kmalloc(sizeof(HV_MESSAGE), GFP_ATOMIC);
if (copied == NULL)
{
continue;

1
drivers/staging/hv/include/osd.h
View File

@ -121,7 +121,6 @@ extern void PageFree(void* page, unsigned int count);
extern void* MemMapIO(unsigned long phys, unsigned long size);
extern void MemUnmapIO(void* virt);
extern void* MemAllocAtomic(unsigned int size);
extern void MemFree(void* buf);
extern void MemoryFence(void);

5
drivers/staging/hv/osd.c
View File

@ -189,11 +189,6 @@ void PageUnmapVirtualAddress(void* VirtAddr)
kunmap_atomic(VirtAddr, KM_IRQ0);
}
void* MemAllocAtomic(unsigned int size)
{
return kmalloc(size, GFP_ATOMIC);
}
void MemFree(void* buf)
{
kfree(buf);