Prev: [121/197] x86: Fix breakage of UML from the changes in the rwsem system
Next: [134/197] PCIe AER: prevent AER injection if hardware masks error reporting
From: Greg KH on 22 Apr 2010 15:50
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: Borislav Petkov <borislav.petkov(a)amd.com>

commit 48a719c238bcbb72d6da79de9c5b3b93ab472107 upstream.

Simplify if-statement while at it.

[ hpa: we need to #include <asm/smp.h> ]

Cc: Dave Jones <davej(a)redhat.com>
Cc: David Airlie <airlied(a)linux.ie>
Signed-off-by: Borislav Petkov <borislav.petkov(a)amd.com>
LKML-Reference: <1264172467-25155-3-git-send-email-bp(a)amd64.org>
Signed-off-by: H. Peter Anvin <hpa(a)zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/char/agp/intel-agp.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)

--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -8,6 +8,7 @@
#include <linux/kernel.h>
#include <linux/pagemap.h>
#include <linux/agp_backend.h>
+#include <asm/smp.h>
#include "agp.h"

/*
@@ -815,12 +816,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 +832,10 @@ static void intel_i830_chipset_flush(str

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.


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [121/197] x86: Fix breakage of UML from the changes in the rwsem system
Next: [134/197] PCIe AER: prevent AER injection if hardware masks error reporting