diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-10 20:31:49 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-10 20:31:49 -0500 |
| commit | 84cdda8a1966288de26be5cecf7702d378861ff9 (patch) | |
| tree | 914924b2a78ca756a35c3480d7abb2726f2db1f4 /arch/ia64/kernel/efi.c | |
| parent | 3c50c61826d1e2e9354232f625216c8fcfef48db (diff) | |
| parent | 6e6ece5dc6022e8086c565498d23511bbceda811 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index f72ea6aebcb1..a3aa45cbcfa0 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -987,7 +987,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, | |||
| 987 | break; | 987 | break; |
| 988 | } | 988 | } |
| 989 | 989 | ||
| 990 | if ((res = kcalloc(1, sizeof(struct resource), GFP_KERNEL)) == NULL) { | 990 | if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) { |
| 991 | printk(KERN_ERR "failed to alocate resource for iomem\n"); | 991 | printk(KERN_ERR "failed to alocate resource for iomem\n"); |
| 992 | return; | 992 | return; |
| 993 | } | 993 | } |