Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755342AbYGIHUb (ORCPT ); Wed, 9 Jul 2008 03:20:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752219AbYGIHUX (ORCPT ); Wed, 9 Jul 2008 03:20:23 -0400 Received: from rv-out-0506.google.com ([209.85.198.230]:16031 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751616AbYGIHUW (ORCPT ); Wed, 9 Jul 2008 03:20:22 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=fHdBpv8Y2bGtLIFxpzqg2stxZv146flEII1neNlj8REH4M38SKL2/4vouuDdr29icw yqoHLMvD1cw95hvN3Bge/tEmapygQoO2SvAJRfbVBLj9qOxjBSjgPmNyzrGSFoYf73hr EsQW1WhYgIE3w/n11R8Ad7WSNioM6KYF6b1Ss= Message-ID: <86802c440807090020q516b6332qf8e0d65918e7001e@mail.gmail.com> Date: Wed, 9 Jul 2008 00:20:21 -0700 From: "Yinghai Lu" To: "Ingo Molnar" Subject: Re: [PATCH 05/05] x86: Rename paravirtualized TSC functions Cc: "Alok Kataria" , "Thomas Gleixner" , "the arch/x86 maintainers" , "Dan Hecht" , LKML In-Reply-To: <20080709061336.GG9760@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1214937816.20191.34.camel@promb-2n-dhcp368.eng.vmware.com> <20080709061336.GG9760@elte.hu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3780 Lines: 88 On Tue, Jul 8, 2008 at 11:13 PM, Ingo Molnar wrote: > > * Alok Kataria wrote: > >> Rename the paravirtualized calculate_cpu_khz to calibrate_tsc. In all >> cases, we actually calibrate_tsc and use that as the cpu_khz value. > > thanks Alok, i've applied all 5 unification patches to tip/x86/core: > > Alok Kataria (5): > x86: merge sched_clock handling > x86: merge tsc calibration > x86: merge the TSC cpu-freq code > x86: merge tsc_init and clocksource code > x86: rename paravirtualized TSC functions > > they are looking good in testing so far. got calling ixgb_init_module+0x0/0x76 Intel(R) PRO/10GbE Network Driver - version 1.0.126-k4 Copyright (c) 1999-2006 Intel Corporation. vendor=1022 device=7458 ACPI: PCI Interrupt 0000:0c:01.0[A] -> GSI 56 (level, low) -> IRQ 56 ixgb: eth18: ixgb_probe: Intel(R) PRO/10GbE Network Connection BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 IP: [] hrtick_start_fair+0x89/0x173 PGD 0 Oops: 0000 [1] SMP CPU 4 Modules linked in: Pid: 103, comm: events/4 Not tainted 2.6.26-rc9-tip-00026-geae1aa0-dirty #240 RIP: 0010:[] [] hrtick_start_fair+0x89/0x173 RSP: 0018:ffff88082481fbd0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: ffff880824828000 RCX: 0000000000000006 RDX: ffff88084423e700 RSI: ffff880824828000 RDI: ffff88084423e700 RBP: ffff88082481fc00 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: ffff88084423e700 R13: ffff880844239700 R14: ffff880824828000 R15: 0000000000000c1a FS: 0000000000000000(0000) GS:ffff881024c39600(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000000000 CR3: 0000000000201000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process events/4 (pid: 103, threadinfo ffff88082481e000, task ffff880824814230) Stack: ffff880844248118 000000005c0ee9e3 ffff880844239700 ffff88082490d878 ffff88084423e700 0000000000000000 ffff88082481fc40 ffffffff80256591 ffff88082481fc30 ffffffff80516fc5 000000005c0ee9e3 ffff88082490d840 Call Trace: [] dequeue_task_fair+0x5f/0x7e [] ? __first_cpu+0x26/0x49 [] dequeue_task+0xce/0xf0 [] deactivate_task+0x31/0x50 [] pull_task+0x2c/0x78 [] load_balance_fair+0x18d/0x277 [] schedule+0x3db/0x962 [] ? vmstat_update+0x0/0x5e [] ? schedule_delayed_work+0x31/0x48 [] worker_thread+0xbb/0x114 [] ? autoremove_wake_function+0x0/0x63 [] ? worker_thread+0x0/0x114 [] kthread+0x61/0xa4 [] ? schedule_tail+0x36/0x81 [] child_rip+0xa/0x11 [] ? kthread+0x0/0xa4 [] ? child_rip+0x0/0x11 Code: c3 80 e8 86 04 01 00 80 3d 76 52 c0 00 00 0f 89 e1 00 00 00 41 f6 84 24 70 08 00 00 04 0f 85 d2 00 00 00 49 8b 84 24 a8 08 00 00 <48> 8b 00 83 b8 c0 00 00 00 00 0f 84 ba 00 00 00 49 83 7d 10 01 RIP [] hrtick_start_fair+0x89/0x173 RSP CR2: 0000000000000000 ---[ end trace c05d5c1f5b126388 ]--- yesterday tip/mater with tip/x86/modules tip-history-2008-07-08_16.08_Tue works well. others traps merge seems not to cause the problem.. YH -- 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/