1. 07 Apr, 2008 8 commits
    • Linus Torvalds's avatar
      Revert "smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade" · 099c736a
      Linus Torvalds authored
      This reverts commit 9e6db608, which was
      merged without the API it needed, causing build breakage.
      Reported-by: default avatarBryan Wu <cooloney@kernel.org>
      Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      099c736a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 · 950b0d28
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
        x86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU
        x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()
        revert "x86: tsc prevent time going backwards"
      950b0d28
    • Rusty Russell's avatar
      virtio: remove overzealous BUG_ON. · 2557a933
      Rusty Russell authored
      The 'disable_cb' callback is designed as an optimization to tell the host
      we don't need callbacks now.  As it is not reliable, the debug check is
      overzealous: it can happen on two CPUs at the same time.  Document this.
      
      Even if it were reliable, the virtio_net driver doesn't disable
      callbacks on transmit so the START_USE/END_USE debugging reentrance
      protection can be easily tripped even on UP.
      
      Thanks to Balaji Rao for the bug report and testing.
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      CC: Balaji Rao <balajirrao@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2557a933
    • Suresh Siddha's avatar
      x86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU · 871de939
      Suresh Siddha authored
      ASM_NOP's for 64-bit kernel with CONFIG_GENERIC_CPU is broken
      with the recent x86 nops merge. They were using GENERIC_NOPS
      which will truncate the upper 32bits of %rsi, because of the missing
      64bit rex prefix.
      
      For now, fall back ASM NOPS for generic cpu to K8 NOPS, similar
      to the code before the wrong x86 nop merge.
      
      This should resolve the crash seen by Ingo on a test-system:
      
      BUG: unable to handle kernel paging request at 00000000d80d8ee8
      IP: [<ffffffff802121af>] save_i387_ia32+0x61/0xd8
      PGD b8e0067 PUD 51490067 PMD 0
      Oops: 0000 [1] SMP
      CPU 2
      Modules linked in:
      Pid: 3871, comm: distcc Not tainted 2.6.25-rc7-sched-devel.git-x86-latest.git #359
      RIP: 0010:[<ffffffff802121af>]  [<ffffffff802121af>] save_i387_ia32+0x61/0xd8
      RSP: 0000:ffff81003abd3cb8  EFLAGS: 00010246
      RAX: ffff810082e93400 RBX: 00000000ffc37f84 RCX: ffff8100d80d8ee0
      RDX: 0000000000000000 RSI: 00000000d80d8ee0 RDI: ffff810082e93400
      RBP: 00000000ffc37fdc R08: 00000000ffc37f88 R09: 0000000000000008
      R10: ffff81003abd2000 R11: 0000000000000000 R12: ffff810082e93400
      R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
      FS:  0000000000000000(0000) GS:ffff81011fb12dc0(0063) knlGS:00000000f7f1a6c0
      CS:  0010 DS: 002b ES: 002b CR0: 0000000080050033
      CR2: 00000000d80d8ee8 CR3: 0000000076922000 CR4: 00000000000006e0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      Process distcc (pid: 3871, threadinfo ffff81003abd2000, task ffff8100d80d8ee0)
      Stack:  ffff8100bb670380 ffffffff8026de50 0000000000000118 0000000000000002
       0000000000000002 ffff81003abd3e68 ffff81003abd3ed8 ffff81003abd3de8
       ffff81003abd3d18 ffffffff80229785 ffff8100d80d8ee0 ffff810001041280
      Call Trace:
       [<ffffffff8026de50>] ? __generic_file_aio_write_nolock+0x343/0x377
       [<ffffffff80229785>] ? update_curr+0x54/0x64
       [<ffffffff80227cd3>] ? ia32_setup_sigcontext+0x125/0x1d2
       [<ffffffff8022839f>] ? ia32_setup_frame+0x73/0x1a5
       [<ffffffff8020b2a5>] ? do_notify_resume+0x1aa/0x7db
       [<ffffffff8024ae8c>] ? getnstimeofday+0x31/0x85
       [<ffffffff80249858>] ? ktime_get_ts+0x17/0x48
       [<ffffffff80249933>] ? ktime_get+0xc/0x41
       [<ffffffff8024973e>] ? hrtimer_nanosleep+0x75/0xd5
       [<ffffffff80249261>] ? hrtimer_wakeup+0x0/0x21
       [<ffffffff8020bfbc>] ? int_signal+0x12/0x17
       [<ffffffff8030e6b3>] ? dummy_file_free_security+0x0/0x1
      
      Code: a6 08 05 00 00 f6 40 14 01 74 34 4c 89 e7 48 0f ae 07 48 8b 86 08 05 00 00 80 78 02 00 79 02 db e2 90 8d b4 26 00 00 00 00 89 f6 <48> 8b 46 08 83 60 14 fe 0f 20 c0 48 83 c8 08 0f 22 c0 eb 07 c6 
      Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      871de939
    • Karsten Wiese's avatar
      x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier() · 4f41c94d
      Karsten Wiese authored
      In time_cpufreq_notifier() the cpu id to act upon is held in freq->cpu. Use it
      instead of smp_processor_id() in the call to set_cyc2ns_scale().
      This makes the preempt_*able() unnecessary and lets set_cyc2ns_scale() update
      the intended cpu's cyc2ns.
      
      Related mail/thread: http://lkml.org/lkml/2007/12/7/130Signed-off-by: default avatarKarsten Wiese <fzu@wemgehoertderstaat.de>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      4f41c94d
    • Ingo Molnar's avatar
      revert "x86: tsc prevent time going backwards" · 5b13d863
      Ingo Molnar authored
      revert:
      
      | commit 47001d60
      | Author: Thomas Gleixner <tglx@linutronix.de>
      | Date:   Tue Apr 1 19:45:18 2008 +0200
      |
      |     x86: tsc prevent time going backwards
      
      it has been identified to cause suspend regression - and the
      commit fixes a longstanding bug that existed before 2.6.25 was
      opened - so it can wait some more until the effects are better
      understood.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      5b13d863
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 4cac04dd
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        fix endian lossage in forcedeth
        net/tokenring/olympic.c section fixes
        net: marvell.c fix sparse shadowed variable warning
        [VLAN]: Fix egress priority mappings leak.
        [TG3]: Add PHY workaround for 5784
        [NET]: srandom32 fixes for networking v2
        [IPV6]: Fix refcounting for anycast dst entries.
        [IPV6]: inet6_dev on loopback should be kept until namespace stop.
        [IPV6]: Event type in addrconf_ifdown is mis-used.
        [ICMP]: Ensure that ICMP relookup maintains status quo
      4cac04dd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · e1c287b9
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix user accesses in regset code.
        [SPARC64]: Fix FPU saving in 64-bit signal handling.
      e1c287b9
  2. 06 Apr, 2008 12 commits
  3. 05 Apr, 2008 1 commit
  4. 04 Apr, 2008 19 commits