The patch titled
revert x86_64-mm-cpa-clflush
has been added to the -mm tree. Its filename is
revert-x86_64-mm-cpa-clflush.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: revert x86_64-mm-cpa-clflush
From: Andrew Morton <akpm@xxxxxxxx>
general protection fault: 0000 [1] PREEMPT SMP
last sysfs file:
CPU 1
Modules linked in:
Pid: 0, comm: swapper Not tainted 2.6.19-rc3 #6
RIP: 0010:[<ffffffff80220d6c>] [<ffffffff80220d6c>] flush_kernel_map+0x24/0x50
RSP: 0018:ffff81017fc9bf78 EFLAGS: 00010093
RAX: 001f40ffc0000000 RBX: 001f40ffc0000000 RCX: 0000000000000040
RDX: 0000000000000000 RSI: 0000000000000002 RDI: 001f40ffc0000000
RBP: ffff81017fc9bf78 R08: ffff81017fc92010 R09: ffffffff80636040
R10: ffffffff80636040 R11: ffffffff80636040 R12: ffffffff80220d48
R13: 0000000000000001 R14: ffffffff805ec300 R15: 0000000000000000
FS: 0000000000000000(0000) GS:ffff81017fc0ca20(0000) knlGS:0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000000000 CR3: 0000000000201000 CR4: 00000000000006e0
Process swapper (pid: 0, threadinfo ffff81017fc92000, task ffff81017fc69100)
Stack: ffff81017fc9bfa8 ffffffff80217c06 ffffffff80636040 ffffffff802082f4
0000000000000001 0000000000000001 ffff81017fc93e30 ffffffff8020a4b6
ffff81017fc93e30 <EOI> ffff81017fc93eb8 ffffffff80636040 ffffffff80636040
Call Trace:
<IRQ> [<ffffffff80217c06>] smp_call_function_interrupt+0x4b/0x6c
[<ffffffff802082f4>] mwait_idle+0x0/0x10
[<ffffffff8020a4b6>] call_function_interrupt+0x66/0x70
<EOI> [<ffffffff802082f2>] mwait_idle_with_hints+0x4c/0x4e
[<ffffffff80208302>] mwait_idle+0xe/0x10
[<ffffffff8020826d>] cpu_idle+0x8d/0xc6
[<ffffffff802191b3>] start_secondary+0x478/0x489
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/mm/pageattr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN arch/x86_64/mm/pageattr.c~revert-x86_64-mm-cpa-clflush arch/x86_64/mm/pageattr.c
--- a/arch/x86_64/mm/pageattr.c~revert-x86_64-mm-cpa-clflush
+++ a/arch/x86_64/mm/pageattr.c
@@ -64,9 +64,8 @@ static struct page *split_large_page(uns
static void flush_kernel_map(void *address)
{
- /* When clflush is available always use it because it is
- much cheaper than WBINVD */
- if (cpu_has_clflush) {
+ if (0 && address && cpu_has_clflush) {
+ /* is this worth it? */
int i;
for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)
asm volatile("clflush (%0)" :: "r" (address + i));
@@ -78,6 +77,7 @@ static void flush_kernel_map(void *addre
__flush_tlb_all();
}
+
static inline void flush_map(unsigned long address)
{
on_each_cpu(flush_kernel_map, (void *)address, 1, 1);
@@ -213,7 +213,7 @@ void global_flush_tlb(void)
dpage = xchg(&deferred_pages, NULL);
up_read(&init_mm.mmap_sem);
- flush_map((unsigned long)page_address(dpage));
+ flush_map((dpage && !dpage->lru.next) ? (unsigned long)page_address(dpage) : 0);
while (dpage) {
struct page *tmp = dpage;
dpage = (struct page *)dpage->lru.next;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
ioc4_serial-irq-flags-fix.patch
revert-pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch
revert-generic_file_buffered_write-handle-zero-length-iovec-segments.patch
revert-generic_file_buffered_write-deadlock-on-vectored-write.patch
generic_file_buffered_write-cleanup.patch
mm-fix-pagecache-write-deadlocks.patch
fs-prepare_write-fixes-fuse-fix.patch
fs-prepare_write-fixes-fat-fix.patch
git-acpi.patch
git-acpi-fixup.patch
git-acpi-more-build-fixes.patch
git-acpi-build-fix-99.patch
git-acpi-mmconfig-warning-fix.patch
git-acpi-cpufreq-fix.patch
git-acpi-cpufreq-fix-2.patch
git-acpi-printk-warning-fix.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
git-cpufreq-prep.patch
git-cpufreq.patch
revert-gregkh-driver-network-device.patch
nozomi-warning-fixes.patch
nozomi-irq-flags-fixes.patch
git-dvb.patch
git-ia64.patch
git-input-fixup.patch
git-libata-all.patch
git-mtd.patch
git-netdev-all.patch
libphy-dont-do-that.patch
git-net-configh-got-removed.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
netxen-build-fix.patch
netxen-more-build-fixes.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
ioat-warning-fix.patch
git-pcmcia.patch
revert-scsi-ips-soft-lockup-during-reset-initialization.patch
scsi-ips-soft-lockup-during-reset-initialization-2.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
git-watchdog.patch
revert-x86_64-mm-cpa-clflush.patch
prep-for-paravirt-be-careful-about-touching-bios-warning-fix.patch
prep-for-paravirt-desch-clearer-parameter-names-fix.patch
xfs-rename-uio_read.patch
touchkit-ps-2-touchscreen-driver.patch
get-rid-of-zone_table.patch
new-scheme-to-preempt-swap-token-tidy.patch
balance_pdgat-cleanup.patch
vmalloc-optimization-cleanup-bugfixes-tweak.patch
radix-tree-rcu-lockless-readside.patch
acx1xx-wireless-driver.patch
swsusp-add-resume_offset-command-line-parameter-rev-2.patch
add-include-linux-freezerh-and-move-definitions-from-ueagle-fix.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
kbuild-dont-put-temp-files-in-the-source-tree.patch
lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch
drivers-add-lcd-support-3-Kconfig-fix.patch
setup_irq-better-mismatch-debugging.patch
probe_kernel_address-needs-to-do-set_fs.patch
slab-use-probe_kernel_address.patch
pktcdvd-bio-write-congestion-using-blk_congestion_wait-fix.patch
bug-test-1.patch
fsstack-introduce-fsstack_copy_attrinode_-tidy.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-fix.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-vs-git-cryptodev.patch
add-process_session-helper-routine-deprecate-old-field-tidy.patch
add-process_session-helper-routine-deprecate-old-field-fix-warnings.patch
add-process_session-helper-routine-deprecate-old-field-fix-warnings-2.patch
fs-cache-provide-a-filesystem-specific-syncable-page-bit-ext4.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-log2-fix.patch
mxser-session-warning-fix.patch
tty-switch-to-ktermios-and-new-framework-warning-fix.patch
tty-switch-to-ktermios-bluetooth-fix.patch
drivers-isdn-handcrafted-min-max-macro-removal-fix.patch
swap_prefetch-vs-zoned-counters.patch
add-include-linux-freezerh-and-move-definitions-from-prefetch.patch
readahead-sysctl-parameters.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
resier4-add-include-linux-freezerh-and-move-definitions-from.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
hpt3xx-rework-rate-filtering-tidy.patch
statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy.patch
gtod-persistent-clock-support-i386.patch
hrtimers-state-tracking.patch
clockevents-drivers-for-i386.patch
gtod-mark-tsc-unusable-for-highres-timers.patch
round_jiffies-infrastructure-fix.patch
kevent-core-files-fix.patch
kevent-core-files-s390-hack.patch
kevent-socket-notifications-fix-2.patch
kevent-socket-notifications-fix-4.patch
kevent-timer-notifications-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
mutex-subsystem-synchro-test-module-fix.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-fix.patch
squash-ipc-warnings.patch
squash-udf-warnings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
