From 1ad656a00d29eb819b9174f0c34ee205414214d0 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Sun, 9 May 2010 17:39:05 +0000 Subject: [PATCH] --- yaml --- r: 196675 b: refs/heads/master c: 99ec28f183daa450faa7bdad6f932364ae325648 h: refs/heads/master i: 196673: 1f6acf3d7069313c8cd8e24a9d1f5573c6f6b0c1 196671: 0cd373e6002cf27a4da717492ddc1b2590d2aca6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/iommu.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 4ca1aa6e638a..7ed3e991b8bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40a5a4435f37b172dec09852ad2036865f9ca3c8 +refs/heads/master: 99ec28f183daa450faa7bdad6f932364ae325648 diff --git a/trunk/arch/powerpc/kernel/iommu.c b/trunk/arch/powerpc/kernel/iommu.c index ec94f906ea43..d5839179ec77 100644 --- a/trunk/arch/powerpc/kernel/iommu.c +++ b/trunk/arch/powerpc/kernel/iommu.c @@ -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")) @@ -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,