diff options
author | Jonathan Gray <jsg@jsg.id.au> | 2013-05-01 12:35:29 +1000 |
---|---|---|
committer | Jonathan Gray <jsg@jsg.id.au> | 2013-08-12 10:34:54 +1000 |
commit | 701eaa5329a47fbfaf7f56f8bfad12533704fcb9 (patch) | |
tree | 2f55e04156aa11b7fbcd4fcab9ba7e49a3275f41 | |
parent | 4b1a1aae075b3dbf28b3bb8a59a44fa97ec5578c (diff) |
kmalloc -> malloc
-rw-r--r-- | sys/dev/pci/drm/radeon/atombios_encoders.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon/radeon_atombios.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon/radeon_bios.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon/radeon_combios.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon/radeon_fence.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon/radeon_legacy_encoders.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon/radeon_sa.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon/radeon_semaphore.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pci/drm/radeon/atombios_encoders.c b/sys/dev/pci/drm/radeon/atombios_encoders.c index 99db266dc63..a3d0ab6c5a1 100644 --- a/sys/dev/pci/drm/radeon/atombios_encoders.c +++ b/sys/dev/pci/drm/radeon/atombios_encoders.c @@ -194,7 +194,7 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, if (!(rdev->mode_info.firmware_flags & ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU)) return; - pdata = kmalloc(sizeof(struct radeon_backlight_privdata), GFP_KERNEL); + pdata = malloc(sizeof(struct radeon_backlight_privdata), M_DRM, M_WAITOK); if (!pdata) { DRM_ERROR("Memory allocation failed\n"); goto error; diff --git a/sys/dev/pci/drm/radeon/radeon_atombios.c b/sys/dev/pci/drm/radeon/radeon_atombios.c index 11ac8a3e66f..a23824e1f11 100644 --- a/sys/dev/pci/drm/radeon/radeon_atombios.c +++ b/sys/dev/pci/drm/radeon/radeon_atombios.c @@ -1639,7 +1639,7 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct struct edid *edid; int edid_size = max((int)EDID_LENGTH, (int)fake_edid_record->ucFakeEDIDLength); - edid = kmalloc(edid_size, GFP_KERNEL); + edid = malloc(edid_size, M_DRM, M_WAITOK); if (edid) { memcpy((u8 *)edid, (u8 *)&fake_edid_record->ucFakeEDIDString[0], fake_edid_record->ucFakeEDIDLength); diff --git a/sys/dev/pci/drm/radeon/radeon_bios.c b/sys/dev/pci/drm/radeon/radeon_bios.c index 1565eee28ea..aa2c9c4f4ba 100644 --- a/sys/dev/pci/drm/radeon/radeon_bios.c +++ b/sys/dev/pci/drm/radeon/radeon_bios.c @@ -61,7 +61,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev) iounmap(bios); return false; } - rdev->bios = kmalloc(size, GFP_KERNEL); + rdev->bios = malloc(size, M_DRM, M_WAITOK); if (rdev->bios == NULL) { iounmap(bios); return false; @@ -173,7 +173,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) if (!found) return false; - rdev->bios = kmalloc(size, GFP_KERNEL); + rdev->bios = malloc(size, M_DRM, M_WAITOK); if (!rdev->bios) { DRM_ERROR("Unable to allocate bios\n"); return false; diff --git a/sys/dev/pci/drm/radeon/radeon_combios.c b/sys/dev/pci/drm/radeon/radeon_combios.c index 8d326d4865b..0b8c08bd27a 100644 --- a/sys/dev/pci/drm/radeon/radeon_combios.c +++ b/sys/dev/pci/drm/radeon/radeon_combios.c @@ -449,7 +449,7 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev) raw = rdev->bios + edid_info; size = EDID_LENGTH * (raw[0x7e] + 1); - edid = kmalloc(size, GFP_KERNEL); + edid = malloc(size, M_DRM, M_WAITOK); if (edid == NULL) return false; @@ -472,7 +472,7 @@ radeon_bios_get_hardcoded_edid(struct radeon_device *rdev) struct edid *edid; if (rdev->mode_info.bios_hardcoded_edid) { - edid = kmalloc(rdev->mode_info.bios_hardcoded_edid_size, GFP_KERNEL); + edid = malloc(rdev->mode_info.bios_hardcoded_edid_size, M_DRM, M_WAITOK); if (edid) { memcpy((unsigned char *)edid, (unsigned char *)rdev->mode_info.bios_hardcoded_edid, diff --git a/sys/dev/pci/drm/radeon/radeon_fence.c b/sys/dev/pci/drm/radeon/radeon_fence.c index 75b3b7a4d75..9f3e312b588 100644 --- a/sys/dev/pci/drm/radeon/radeon_fence.c +++ b/sys/dev/pci/drm/radeon/radeon_fence.c @@ -100,7 +100,7 @@ int radeon_fence_emit(struct radeon_device *rdev, int ring) { /* we are protected by the ring emission rwlock */ - *fence = kmalloc(sizeof(struct radeon_fence), GFP_KERNEL); + *fence = malloc(sizeof(struct radeon_fence), M_DRM, M_WAITOK); if ((*fence) == NULL) { return -ENOMEM; } diff --git a/sys/dev/pci/drm/radeon/radeon_legacy_encoders.c b/sys/dev/pci/drm/radeon/radeon_legacy_encoders.c index a5eeb7e51d2..0646697dccd 100644 --- a/sys/dev/pci/drm/radeon/radeon_legacy_encoders.c +++ b/sys/dev/pci/drm/radeon/radeon_legacy_encoders.c @@ -377,7 +377,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, return; #endif - pdata = kmalloc(sizeof(struct radeon_backlight_privdata), GFP_KERNEL); + pdata = malloc(sizeof(struct radeon_backlight_privdata), M_DRM, M_WAITOK); if (!pdata) { DRM_ERROR("Memory allocation failed\n"); goto error; diff --git a/sys/dev/pci/drm/radeon/radeon_sa.c b/sys/dev/pci/drm/radeon/radeon_sa.c index a5c38ed92a7..5364b3e9dcb 100644 --- a/sys/dev/pci/drm/radeon/radeon_sa.c +++ b/sys/dev/pci/drm/radeon/radeon_sa.c @@ -320,7 +320,7 @@ int radeon_sa_bo_new(struct radeon_device *rdev, BUG_ON(align > RADEON_GPU_PAGE_SIZE); BUG_ON(size > sa_manager->size); - *sa_bo = kmalloc(sizeof(struct radeon_sa_bo), GFP_KERNEL); + *sa_bo = malloc(sizeof(struct radeon_sa_bo), M_DRM, M_WAITOK); if ((*sa_bo) == NULL) { return -ENOMEM; } diff --git a/sys/dev/pci/drm/radeon/radeon_semaphore.c b/sys/dev/pci/drm/radeon/radeon_semaphore.c index 46d328d0671..ca015a2495a 100644 --- a/sys/dev/pci/drm/radeon/radeon_semaphore.c +++ b/sys/dev/pci/drm/radeon/radeon_semaphore.c @@ -36,7 +36,7 @@ int radeon_semaphore_create(struct radeon_device *rdev, { int r; - *semaphore = kmalloc(sizeof(struct radeon_semaphore), GFP_KERNEL); + *semaphore = malloc(sizeof(struct radeon_semaphore), M_DRM, M_WAITOK); if (*semaphore == NULL) { return -ENOMEM; } |