Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755140Ab0AVPBl (ORCPT ); Fri, 22 Jan 2010 10:01:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754370Ab0AVPA6 (ORCPT ); Fri, 22 Jan 2010 10:00:58 -0500 Received: from s15228384.onlinehome-server.info ([87.106.30.177]:39181 "EHLO mail.x86-64.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753627Ab0AVPA4 (ORCPT ); Fri, 22 Jan 2010 10:00:56 -0500 From: Borislav Petkov To: , , Cc: , , , Borislav Petkov , Dave Jones , David Airlie Subject: [PATCH 2/5] intel-agp: Switch to wbinvd_on_all_cpus Date: Fri, 22 Jan 2010 16:01:04 +0100 Message-Id: <1264172467-25155-3-git-send-email-bp@amd64.org> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1264172467-25155-1-git-send-email-bp@amd64.org> References: <1264172467-25155-1-git-send-email-bp@amd64.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1579 Lines: 52 From: Borislav Petkov Simplify if-statement while at it. Cc: Dave Jones Cc: David Airlie Signed-off-by: Borislav Petkov --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/