1. 20 4月, 2009 7 次提交
    • P
      x86, acpi_cpufreq: Fix the NULL pointer dereference in get_measured_perf · 093f13e2
      Pallipadi, Venkatesh 提交于
      Fix for a regression that was introduced by earlier commit
      18b2646f on Mon Apr 6 11:26:08 2009
      
      Regression resulted in the below error happened on systems with
      software coordination where per_cpu acpi data will not be initiated for
      secondary CPUs in a P-state domain.
      
      On Tue, 2009-04-14 at 23:01 -0700, Zhang, Yanmin wrote:
       My machine hanged with kernel 2.6.30-rc2 when script read
      > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor.
      >
      > opps happens in get_measured_perf:
      >
      >         cur.aperf.whole = readin.aperf.whole -
      >                                 per_cpu(drv_data, cpu)->saved_aperf;
      >
      > Because per_cpu(drv_data, cpu)=NULL.
      >
      > So function get_measured_perf should check if (per_cpu(drv_data,
      > cpu)==NULL)
      > and return 0 if it's NULL.
      
      --------------sys log------------------
      
      BUG: unable to handle kernel NULL pointer dereference at
      0000000000000020
      IP: [<ffffffff8021af75>] get_measured_perf+0x4a/0xf9
      PGD a7dd88067 PUD a7ccf5067 PMD 0
      Oops: 0000 [#1] SMP
      last sysfs file: /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
      CPU 0
      Modules linked in: video output
      Pid: 2091, comm: kondemand/0 Not tainted 2.6.30-rc2 #1 MP Server
      RIP: 0010:[<ffffffff8021af75>]  [<ffffffff8021af75>]
      get_measured_perf+0x4a/0xf9
      RSP: 0018:ffff880a7d56de20  EFLAGS: 00010246
      RAX: 0000000000000000 RBX: 00000046241a42b6 RCX: ffff88004d219000
      RDX: 000000000000b660 RSI: 0000000000000020 RDI: 0000000000000001
      RBP: ffff880a7f052000 R08: 00000046241a42b6 R09: ffffffff807639f0
      R10: 00000000ffffffea R11: ffffffff802207f4 R12: ffff880a7f052000
      R13: ffff88004d20e460 R14: 0000000000ddd5a6 R15: 0000000000000001
      FS:  0000000000000000(0000) GS:ffff88004d200000(0000)
      knlGS:0000000000000000
      CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
      CR2: 0000000000000020 CR3: 0000000a7f1bf000 CR4: 00000000000006e0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      Process kondemand/0 (pid: 2091, threadinfo ffff880a7d56c000, task
      ffff880a7d4d18c0)
      Stack:
       ffff880a7f052078 ffffffff803efd54 00000046241a42b6 000000462ffa9e95
       0000000000000001 0000000000000001 00000000ffffffea ffffffff8064f41a
       0000000000000012 0000000000000012 ffff880a7f052000 ffffffff80650547
      Call Trace:
       [<ffffffff803efd54>] ? kobject_get+0x12/0x17
       [<ffffffff8064f41a>] ? __cpufreq_driver_getavg+0x42/0x57
       [<ffffffff80650547>] ? do_dbs_timer+0x147/0x272
       [<ffffffff80650400>] ? do_dbs_timer+0x0/0x272
       [<ffffffff802474ca>] ? worker_thread+0x15b/0x1f5
       [<ffffffff8024a02c>] ? autoremove_wake_function+0x0/0x2e
       [<ffffffff8024736f>] ? worker_thread+0x0/0x1f5
       [<ffffffff80249f0d>] ? kthread+0x54/0x83
       [<ffffffff8020c87a>] ? child_rip+0xa/0x20
       [<ffffffff80249eb9>] ? kthread+0x0/0x83
       [<ffffffff8020c870>] ? child_rip+0x0/0x20
      Code: 99 a6 03 00 31 c9 85 c0 0f 85 c3 00 00 00 89 df 4c 8b 44 24 10 48
      c7 c2 60 b6 00 00 48 8b 0c fd e0 30 a5 80 4c 89 c3 48 8b 04 0a <48> 2b
      58 20 48 8b 44 24 18 48 89 1c 24 48 8b 34 0a 48 2b 46 28
      RIP  [<ffffffff8021af75>] get_measured_perf+0x4a/0xf9
       RSP <ffff880a7d56de20>
      CR2: 0000000000000020
      ---[ end trace 2b8fac9a49e19ad4 ]---
      Tested-by: N"Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
      Signed-off-by: NVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      093f13e2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio · d91dfbb4
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio:
        lguest: document 32-bit and PAE requirements
        lguest: tell git to ignore Documentation/lguest/lguest
        virtio: fix suspend when using virtio_balloon
        lguest: fix guest crash on non-linear addresses in gdt pvops
        lguest: fix crash on vmlinux images
      d91dfbb4
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · af8f9372
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - Set function_id only on FG nodes
        ALSA: MAINTAINERS - Update SOUND
        ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
        ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
        ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
        ASoC: Fix include build error in s3c2412-i2s.c
        ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
        ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
        ASoC: Fix jive_wm8750.c build problems
        ASoC: pxa-ssp: allow setting of dai format 0
        ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too
        ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
        ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
        ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
        ALSA: hda_intel.c - Consolidate bitfields
      af8f9372
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · 091ccb00
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
        kbuild: introduce subdir-ccflags-y
        kbuild: support include/generated
      091ccb00
    • S
      Revert "console ASCII glyph 1:1 mapping" · c0b79882
      Samuel Thibault 提交于
      This reverts commit 1c55f187.
      
      Ingo Brueckl was assuming that reverting to 1:1 mapping for chars >= 128
      was not useful, but it happens to be: due to the limitations of the
      Linux console, when a blind user wants to read BIG5 on it, he has no
      other way than loading a font without SFM and let the 1:1 mapping permit
      the screen reader to get the BIG5 encoding.
      Signed-off-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c0b79882
    • R
      <linux/seccomp.h> needs to include <linux/errno.h>. · 42a17ad2
      Ralf Baechle 提交于
      <linux/seccomp.h> uses EINVAL so should include <linux/errno.h>.  This
      fixes a build error on 64-bit MIPS if CONFIG_SECCOMP is disabled.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      42a17ad2
    • A
      Don't set relatime when noatime is specified · 613cbe3d
      Andi Kleen 提交于
      Since commit 0a1c01c9 ("Make relatime
      default") when a file system is mounted explicitely with noatime it gets
      both the MNT_RELATIME and MNT_NOATIME bits set.
      
      This shows up like this in /proc/mounts:
      
        /dev/xxx /yyy ext3 rw,noatime,relatime,errors=continue,data=writeback 0 0
      
      That looks strange.  The VFS uses noatime in this case, but both flags
      are set.  So it's more a cosmetic issue, but still better to fix.
      
      Cc: mjg@redhat.com
      Signed-off-by: NAndi Kleen <ak@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      613cbe3d
  2. 19 4月, 2009 17 次提交
  3. 18 4月, 2009 16 次提交