diff options
author | Pavel Machek <pavel@ucw.cz> | 2008-03-19 10:58:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:59 -0400 |
commit | b552da8740222c35bcd83c9be7b27185bfb6d53c (patch) | |
tree | a70bc63a224d850ecf6935d9bb8a508d8f4764d2 /arch/x86/kernel/pci-dma_64.c | |
parent | 037cab07e9515149fecc2274775807f06ea6b036 (diff) |
x86 iommu: add more documentation
Fix coding style in pci-dma_64.c and add stubs for documentation. I
hope someone fills the rest, I understand maybe off and soft...
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-dma_64.c')
-rw-r--r-- | arch/x86/kernel/pci-dma_64.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c index 375cb2bc45be..ada5a0604992 100644 --- a/arch/x86/kernel/pci-dma_64.c +++ b/arch/x86/kernel/pci-dma_64.c | |||
@@ -232,32 +232,32 @@ static __init int iommu_setup(char *p) | |||
232 | return -EINVAL; | 232 | return -EINVAL; |
233 | 233 | ||
234 | while (*p) { | 234 | while (*p) { |
235 | if (!strncmp(p,"off",3)) | 235 | if (!strncmp(p, "off", 3)) |
236 | no_iommu = 1; | 236 | no_iommu = 1; |
237 | /* gart_parse_options has more force support */ | 237 | /* gart_parse_options has more force support */ |
238 | if (!strncmp(p,"force",5)) | 238 | if (!strncmp(p, "force", 5)) |
239 | force_iommu = 1; | 239 | force_iommu = 1; |
240 | if (!strncmp(p,"noforce",7)) { | 240 | if (!strncmp(p, "noforce", 7)) { |
241 | iommu_merge = 0; | 241 | iommu_merge = 0; |
242 | force_iommu = 0; | 242 | force_iommu = 0; |
243 | } | 243 | } |
244 | 244 | ||
245 | if (!strncmp(p, "biomerge",8)) { | 245 | if (!strncmp(p, "biomerge", 8)) { |
246 | iommu_bio_merge = 4096; | 246 | iommu_bio_merge = 4096; |
247 | iommu_merge = 1; | 247 | iommu_merge = 1; |
248 | force_iommu = 1; | 248 | force_iommu = 1; |
249 | } | 249 | } |
250 | if (!strncmp(p, "panic",5)) | 250 | if (!strncmp(p, "panic", 5)) |
251 | panic_on_overflow = 1; | 251 | panic_on_overflow = 1; |
252 | if (!strncmp(p, "nopanic",7)) | 252 | if (!strncmp(p, "nopanic", 7)) |
253 | panic_on_overflow = 0; | 253 | panic_on_overflow = 0; |
254 | if (!strncmp(p, "merge",5)) { | 254 | if (!strncmp(p, "merge", 5)) { |
255 | iommu_merge = 1; | 255 | iommu_merge = 1; |
256 | force_iommu = 1; | 256 | force_iommu = 1; |
257 | } | 257 | } |
258 | if (!strncmp(p, "nomerge",7)) | 258 | if (!strncmp(p, "nomerge", 7)) |
259 | iommu_merge = 0; | 259 | iommu_merge = 0; |
260 | if (!strncmp(p, "forcesac",8)) | 260 | if (!strncmp(p, "forcesac", 8)) |
261 | iommu_sac_force = 1; | 261 | iommu_sac_force = 1; |
262 | if (!strncmp(p, "allowdac", 8)) | 262 | if (!strncmp(p, "allowdac", 8)) |
263 | forbid_dac = 0; | 263 | forbid_dac = 0; |
@@ -265,7 +265,7 @@ static __init int iommu_setup(char *p) | |||
265 | forbid_dac = -1; | 265 | forbid_dac = -1; |
266 | 266 | ||
267 | #ifdef CONFIG_SWIOTLB | 267 | #ifdef CONFIG_SWIOTLB |
268 | if (!strncmp(p, "soft",4)) | 268 | if (!strncmp(p, "soft", 4)) |
269 | swiotlb = 1; | 269 | swiotlb = 1; |
270 | #endif | 270 | #endif |
271 | 271 | ||