Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43341
b: refs/heads/master
c: 52fd910
h: refs/heads/master
i:
  43339: 21de724
v: v3
  • Loading branch information
Yan Burman authored and Tony Luck committed Dec 7, 2006
1 parent 7224d13 commit 073613f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66888a6e5ffc756b9a4115fc766ee2258eefb928
refs/heads/master: 52fd91088bcbaea5ab441d09d39c21eb684e54ea
10 changes: 3 additions & 7 deletions trunk/arch/ia64/hp/common/sba_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1672,15 +1672,13 @@ ioc_sac_init(struct ioc *ioc)
* SAC (single address cycle) addressable, so allocate a
* pseudo-device to enforce that.
*/
sac = kmalloc(sizeof(*sac), GFP_KERNEL);
sac = kzalloc(sizeof(*sac), GFP_KERNEL);
if (!sac)
panic(PFX "Couldn't allocate struct pci_dev");
memset(sac, 0, sizeof(*sac));

controller = kmalloc(sizeof(*controller), GFP_KERNEL);
controller = kzalloc(sizeof(*controller), GFP_KERNEL);
if (!controller)
panic(PFX "Couldn't allocate struct pci_controller");
memset(controller, 0, sizeof(*controller));

controller->iommu = ioc;
sac->sysdata = controller;
Expand Down Expand Up @@ -1737,12 +1735,10 @@ ioc_init(u64 hpa, void *handle)
struct ioc *ioc;
struct ioc_iommu *info;

ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);
ioc = kzalloc(sizeof(*ioc), GFP_KERNEL);
if (!ioc)
return NULL;

memset(ioc, 0, sizeof(*ioc));

ioc->next = ioc_list;
ioc_list = ioc;

Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/ia64/hp/sim/simserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -684,12 +684,11 @@ static int get_async_struct(int line, struct async_struct **ret_info)
*ret_info = sstate->info;
return 0;
}
info = kmalloc(sizeof(struct async_struct), GFP_KERNEL);
info = kzalloc(sizeof(struct async_struct), GFP_KERNEL);
if (!info) {
sstate->count--;
return -ENOMEM;
}
memset(info, 0, sizeof(struct async_struct));
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
init_waitqueue_head(&info->delta_msr_wait);
Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/ia64/kernel/perfmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -853,9 +853,8 @@ pfm_context_alloc(void)
* allocate context descriptor
* must be able to free with interrupts disabled
*/
ctx = kmalloc(sizeof(pfm_context_t), GFP_KERNEL);
ctx = kzalloc(sizeof(pfm_context_t), GFP_KERNEL);
if (ctx) {
memset(ctx, 0, sizeof(pfm_context_t));
DPRINT(("alloc ctx @%p\n", ctx));
}
return ctx;
Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/ia64/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,10 @@ alloc_pci_controller (int seg)
{
struct pci_controller *controller;

controller = kmalloc(sizeof(*controller), GFP_KERNEL);
controller = kzalloc(sizeof(*controller), GFP_KERNEL);
if (!controller)
return NULL;

memset(controller, 0, sizeof(*controller));
controller->segment = seg;
controller->node = -1;
return controller;
Expand Down

0 comments on commit 073613f

Please sign in to comment.