diff options
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/head_32.S | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index d2fdb0826df2..57ca77787220 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -1086,7 +1086,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, | |||
1086 | 1086 | ||
1087 | dma_dom->aperture_size += APERTURE_RANGE_SIZE; | 1087 | dma_dom->aperture_size += APERTURE_RANGE_SIZE; |
1088 | 1088 | ||
1089 | /* Intialize the exclusion range if necessary */ | 1089 | /* Initialize the exclusion range if necessary */ |
1090 | for_each_iommu(iommu) { | 1090 | for_each_iommu(iommu) { |
1091 | if (iommu->exclusion_start && | 1091 | if (iommu->exclusion_start && |
1092 | iommu->exclusion_start >= dma_dom->aperture[index]->offset | 1092 | iommu->exclusion_start >= dma_dom->aperture[index]->offset |
@@ -1353,7 +1353,7 @@ static void dma_ops_domain_free(struct dma_ops_domain *dom) | |||
1353 | 1353 | ||
1354 | /* | 1354 | /* |
1355 | * Allocates a new protection domain usable for the dma_ops functions. | 1355 | * Allocates a new protection domain usable for the dma_ops functions. |
1356 | * It also intializes the page table and the address allocator data | 1356 | * It also initializes the page table and the address allocator data |
1357 | * structures required for the dma_ops interface | 1357 | * structures required for the dma_ops interface |
1358 | */ | 1358 | */ |
1359 | static struct dma_ops_domain *dma_ops_domain_alloc(void) | 1359 | static struct dma_ops_domain *dma_ops_domain_alloc(void) |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 9f54b209c378..fc293dc8dc35 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -126,7 +126,7 @@ ENTRY(startup_32) | |||
126 | movsl | 126 | movsl |
127 | movl pa(boot_params) + NEW_CL_POINTER,%esi | 127 | movl pa(boot_params) + NEW_CL_POINTER,%esi |
128 | andl %esi,%esi | 128 | andl %esi,%esi |
129 | jz 1f # No comand line | 129 | jz 1f # No command line |
130 | movl $pa(boot_command_line),%edi | 130 | movl $pa(boot_command_line),%edi |
131 | movl $(COMMAND_LINE_SIZE/4),%ecx | 131 | movl $(COMMAND_LINE_SIZE/4),%ecx |
132 | rep | 132 | rep |