[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1264172467-25155-3-git-send-email-bp@amd64.org>
Date: Fri, 22 Jan 2010 16:01:04 +0100
From: Borislav Petkov <bp@...64.org>
To: <mingo@...e.hu>, <hpa@...or.com>, <tglx@...utronix.de>
Cc: <andreas.herrmann3@....com>, <x86@...nel.org>,
<linux-kernel@...r.kernel.org>,
Borislav Petkov <borislav.petkov@....com>,
Dave Jones <davej@...hat.com>, David Airlie <airlied@...ux.ie>
Subject: [PATCH 2/5] intel-agp: Switch to wbinvd_on_all_cpus
From: Borislav Petkov <borislav.petkov@....com>
Simplify if-statement while at it.
Cc: Dave Jones <davej@...hat.com>
Cc: David Airlie <airlied@...ux.ie>
Signed-off-by: Borislav Petkov <borislav.petkov@....com>
---
drivers/char/agp/intel-agp.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 30c36ac..28660b4 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -815,12 +815,6 @@ static void intel_i830_setup_flush(void)
intel_i830_fini_flush();
}
-static void
-do_wbinvd(void *null)
-{
- wbinvd();
-}
-
/* The chipset_flush interface needs to get data that has already been
* flushed out of the CPU all the way out to main memory, because the GPU
* doesn't snoop those buffers.
@@ -837,12 +831,10 @@ static void intel_i830_chipset_flush(struct agp_bridge_data *bridge)
memset(pg, 0, 1024);
- if (cpu_has_clflush) {
+ if (cpu_has_clflush)
clflush_cache_range(pg, 1024);
- } else {
- if (on_each_cpu(do_wbinvd, NULL, 1) != 0)
- printk(KERN_ERR "Timed out waiting for cache flush.\n");
- }
+ else if (wbinvd_on_all_cpus() != 0)
+ printk(KERN_ERR "Timed out waiting for cache flush.\n");
}
/* The intel i830 automatically initializes the agp aperture during POST.
--
1.6.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists