Skip to content

Commit

Permalink
powerpc: Remove unused 'protect4gb' boot parameter
Browse files Browse the repository at this point in the history
'protect4gb' boot parameter was introduced to avoid allocating dma
space acrossing 4GB boundary in 2007 (the commit
5699755).

In 2008, the IOMMU was fixed to use the boundary_mask parameter per
device properly. So 'protect4gb' workaround was removed (the
383af95). 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>
  • Loading branch information
FUJITA Tomonori authored and Benjamin Herrenschmidt committed May 21, 2010
1 parent 40a5a44 commit 99ec28f
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions arch/powerpc/kernel/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,9 @@
#define DBG(...)

static int novmerge;
static int protect4gb = 1;

static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int);

static int __init setup_protect4gb(char *str)
{
if (strcmp(str, "on") == 0)
protect4gb = 1;
else if (strcmp(str, "off") == 0)
protect4gb = 0;

return 1;
}

static int __init setup_iommu(char *str)
{
if (!strcmp(str, "novmerge"))
Expand All @@ -66,7 +55,6 @@ static int __init setup_iommu(char *str)
return 1;
}

__setup("protect4gb=", setup_protect4gb);
__setup("iommu=", setup_iommu);

static unsigned long iommu_range_alloc(struct device *dev,
Expand Down

0 comments on commit 99ec28f

Please sign in to comment.