diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-05-09 13:39:05 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-21 03:31:13 -0400 |
commit | 99ec28f183daa450faa7bdad6f932364ae325648 (patch) | |
tree | 4fd2d505dd71412f2fc630ac700fc9a7348aaaab /arch | |
parent | 40a5a4435f37b172dec09852ad2036865f9ca3c8 (diff) |
powerpc: Remove unused 'protect4gb' boot parameter
'protect4gb' boot parameter was introduced to avoid allocating dma
space acrossing 4GB boundary in 2007 (the commit
569975591c5530fdc9c7a3c45122e5e46f075a74).
In 2008, the IOMMU was fixed to use the boundary_mask parameter per
device properly. So 'protect4gb' workaround was removed (the
383af9525bb27f927511874f6306247ec13f1c28). But somehow I messed the
'protect4gb' boot parameter that was used to enable the
workaround.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/iommu.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index ec94f906ea43..d5839179ec77 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c | |||
@@ -43,20 +43,9 @@ | |||
43 | #define DBG(...) | 43 | #define DBG(...) |
44 | 44 | ||
45 | static int novmerge; | 45 | static int novmerge; |
46 | static int protect4gb = 1; | ||
47 | 46 | ||
48 | static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int); | 47 | static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int); |
49 | 48 | ||
50 | static int __init setup_protect4gb(char *str) | ||
51 | { | ||
52 | if (strcmp(str, "on") == 0) | ||
53 | protect4gb = 1; | ||
54 | else if (strcmp(str, "off") == 0) | ||
55 | protect4gb = 0; | ||
56 | |||
57 | return 1; | ||
58 | } | ||
59 | |||
60 | static int __init setup_iommu(char *str) | 49 | static int __init setup_iommu(char *str) |
61 | { | 50 | { |
62 | if (!strcmp(str, "novmerge")) | 51 | if (!strcmp(str, "novmerge")) |
@@ -66,7 +55,6 @@ static int __init setup_iommu(char *str) | |||
66 | return 1; | 55 | return 1; |
67 | } | 56 | } |
68 | 57 | ||
69 | __setup("protect4gb=", setup_protect4gb); | ||
70 | __setup("iommu=", setup_iommu); | 58 | __setup("iommu=", setup_iommu); |
71 | 59 | ||
72 | static unsigned long iommu_range_alloc(struct device *dev, | 60 | static unsigned long iommu_range_alloc(struct device *dev, |