diff options
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/boot/btfixupprep.c | 4 | ||||
-rw-r--r-- | arch/sparc/mm/iommu.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c index e7f2940bd270..da031159e2b7 100644 --- a/arch/sparc/boot/btfixupprep.c +++ b/arch/sparc/boot/btfixupprep.c | |||
@@ -216,7 +216,7 @@ main1: | |||
216 | switch (buffer[nbase+3]) { | 216 | switch (buffer[nbase+3]) { |
217 | case 'f': | 217 | case 'f': |
218 | if (initval) { | 218 | if (initval) { |
219 | fprintf(stderr, "Cannot use pre-initalized fixups for calls\n%s\n", buffer); | 219 | fprintf(stderr, "Cannot use pre-initialized fixups for calls\n%s\n", buffer); |
220 | exit(1); | 220 | exit(1); |
221 | } | 221 | } |
222 | if (!strcmp (sect, "__ksymtab")) { | 222 | if (!strcmp (sect, "__ksymtab")) { |
@@ -273,7 +273,7 @@ main1: | |||
273 | break; | 273 | break; |
274 | case 'i': | 274 | case 'i': |
275 | if (initval) { | 275 | if (initval) { |
276 | fprintf(stderr, "Cannot use pre-initalized fixups for INT\n%s\n", buffer); | 276 | fprintf(stderr, "Cannot use pre-initialized fixups for INT\n%s\n", buffer); |
277 | exit(1); | 277 | exit(1); |
278 | } | 278 | } |
279 | if (strncmp (buffer + mode+9, "HI22 ", 10) && strncmp (buffer + mode+9, "LO10 ", 10)) { | 279 | if (strncmp (buffer + mode+9, "HI22 ", 10) && strncmp (buffer + mode+9, "LO10 ", 10)) { |
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index 738580665a8d..07fc6a65d9b6 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c | |||
@@ -63,7 +63,7 @@ static void __init sbus_iommu_init(struct platform_device *op) | |||
63 | unsigned long *bitmap; | 63 | unsigned long *bitmap; |
64 | unsigned long tmp; | 64 | unsigned long tmp; |
65 | 65 | ||
66 | iommu = kmalloc(sizeof(struct iommu_struct), GFP_ATOMIC); | 66 | iommu = kmalloc(sizeof(struct iommu_struct), GFP_KERNEL); |
67 | if (!iommu) { | 67 | if (!iommu) { |
68 | prom_printf("Unable to allocate iommu structure\n"); | 68 | prom_printf("Unable to allocate iommu structure\n"); |
69 | prom_halt(); | 69 | prom_halt(); |