25 Oct, 2010

2 commits

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    Update broken web addresses in arch directory.
    Update broken web addresses in the kernel.
    Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
    Revert "Fix typo: configuation => configuration" partially
    ida: document IDA_BITMAP_LONGS calculation
    ext2: fix a typo on comment in ext2/inode.c
    drivers/scsi: Remove unnecessary casts of private_data
    drivers/s390: Remove unnecessary casts of private_data
    net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
    drivers/infiniband: Remove unnecessary casts of private_data
    drivers/gpu/drm: Remove unnecessary casts of private_data
    kernel/pm_qos_params.c: Remove unnecessary casts of private_data
    fs/ecryptfs: Remove unnecessary casts of private_data
    fs/seq_file.c: Remove unnecessary casts of private_data
    arm: uengine.c: remove C99 comments
    arm: scoop.c: remove C99 comments
    Fix typo configue => configure in comments
    Fix typo: configuation => configuration
    Fix typo interrest[ing|ed] => interest[ing|ed]
    Fix various typos of valid in comments
    ...

    Fix up trivial conflicts in:
    drivers/char/ipmi/ipmi_si_intf.c
    drivers/usb/gadget/rndis.c
    net/irda/irnet/irnet_ppp.c

    Linus Torvalds
     
  • * 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
    i7300_edac: Properly initialize per-csrow memory size
    V4L/DVB: i7300_edac: better initialize page counts
    MAINTAINERS: Add maintainer for i7300-edac driver
    i7300-edac: CodingStyle cleanup
    i7300_edac: Improve comments
    i7300_edac: Cleanup: reorganize the file contents
    i7300_edac: Properly detect channel on CE errors
    i7300_edac: enrich FBD error info for corrected errors
    i7300_edac: enrich FBD error info for fatal errors
    i7300_edac: pre-allocate a buffer used to prepare err messages
    i7300_edac: Fix MTR x4/x8 detection logic
    i7300_edac: Make the debug messages coherent with the others
    i7300_edac: Cleanup: remove get_error_info logic
    i7300_edac: Add a code to cleanup error registers
    i7300_edac: Add support for reporting FBD errors
    i7300_edac: Properly detect the type of error correction
    i7300_edac: Detect if the device is on single mode
    i7300_edac: Adds detection for enhanced scrub mode on x8
    i7300_edac: Clear the error bit after reading
    i7300_edac: Add error detection code for global errors
    ...

    Linus Torvalds
     

22 Oct, 2010

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (21 commits)
    EDAC, MCE: Fix shift warning on 32-bit
    EDAC, MCE: Add a BIT_64() macro
    EDAC, MCE: Enable MCE decoding on F12h
    EDAC, MCE: Add F12h NB MCE decoder
    EDAC, MCE: Add F12h IC MCE decoder
    EDAC, MCE: Add F12h DC MCE decoder
    EDAC, MCE: Add support for F11h MCEs
    EDAC, MCE: Enable MCE decoding on F14h
    EDAC, MCE: Fix FR MCEs decoding
    EDAC, MCE: Complete NB MCE decoders
    EDAC, MCE: Warn about LS MCEs on F14h
    EDAC, MCE: Adjust IC decoders to F14h
    EDAC, MCE: Adjust DC decoders to F14h
    EDAC, MCE: Rename files
    EDAC, MCE: Rework MCE injection
    EDAC: Export edac sysfs class to users.
    EDAC, MCE: Pass complete MCE info to decoders
    EDAC, MCE: Sanitize error codes
    EDAC, MCE: Remove unused function parameter
    EDAC, MCE: Add HW_ERR prefix
    ...

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, amd_nb: Enable GART support for AMD family 0x15 CPUs
    x86, amd: Use compute unit information to determine thread siblings
    x86, amd: Extract compute unit information for AMD CPUs
    x86, amd: Add support for CPUID topology extension of AMD CPUs
    x86, nmi: Support NMI watchdog on newer AMD CPU families
    x86, mtrr: Assume SYS_CFG[Tom2ForceMemTypeWB] exists on all future AMD CPUs
    x86, k8: Rename k8.[ch] to amd_nb.[ch] and CONFIG_K8_NB to CONFIG_AMD_NB
    x86, k8-gart: Decouple handling of garts and northbridges
    x86, cacheinfo: Fix dependency of AMD L3 CID
    x86, kvm: add new AMD SVM feature bits
    x86, cpu: Fix allowed CPUID bits for KVM guests
    x86, cpu: Update AMD CPUID feature bits
    x86, cpu: Fix renamed, not-yet-shipping AMD CPUID feature bit
    x86, AMD: Remove needless CPU family check (for L3 cache info)
    x86, tsc: Remove CPU frequency calibration on AMD

    Linus Torvalds
     

21 Oct, 2010

21 commits


18 Oct, 2010

1 commit

  • The patch below updates broken web addresses in the kernel

    Signed-off-by: Justin P. Mattock
    Cc: Maciej W. Rozycki
    Cc: Geert Uytterhoeven
    Cc: Finn Thain
    Cc: Randy Dunlap
    Cc: Matt Turner
    Cc: Dimitry Torokhov
    Cc: Mike Frysinger
    Acked-by: Ben Pfaff
    Acked-by: Hans J. Koch
    Reviewed-by: Finn Thain
    Signed-off-by: Jiri Kosina

    Justin P. Mattock
     

02 Oct, 2010

1 commit

  • Array of udimm sysfs attributes was not ended with NULL marker, leading to
    dereference of random memory.

    EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm0
    EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm1
    EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm2
    BUG: unable to handle kernel NULL pointer dereference at 00000000000001a4
    IP: [] edac_create_mci_instance_attributes+0x148/0x1f1
    Pid: 1, comm: swapper Not tainted 2.6.36-rc3-nv+ #483 P6T SE/System Product Name
    RIP: 0010:[] [] edac_create_mci_instance_attributes+0x148/0x1f1
    (...)
    Call Trace:
    [] edac_create_mci_instance_attributes+0x198/0x1f1
    [] edac_create_sysfs_mci_device+0xbb/0x2b2
    [] edac_mc_add_mc+0x46b/0x557
    [] i7core_probe+0xccf/0xec0
    RIP [] edac_create_mci_instance_attributes+0x148/0x1f1
    ---[ end trace 20de320855b81d78 ]---
    Kernel panic - not syncing: Attempted to kill init!

    Signed-off-by: Marcin Slusarz
    Cc: Mauro Carvalho Chehab
    Acked-by: Doug Thompson
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Marcin Slusarz
     

27 Sep, 2010

1 commit

  • f4347553b30ec66530bfe63c84530afea3803396 removed the edac polling
    mechanism in favor of using a notifier chain for conveying MCE
    information to edac. However, the module removal path didn't test
    whether the driver had setup the polling function workqueue at all and
    the rmmod process was hanging in the kernel at try_to_del_timer_sync()
    in the cancel_delayed_work() path, trying to cancel an uninitialized
    work struct.

    Fix that by adding a balancing check to the workqueue removal path.

    Signed-off-by: Borislav Petkov

    Borislav Petkov
     

25 Sep, 2010

2 commits


21 Sep, 2010

1 commit


18 Sep, 2010

1 commit

  • So far we only provide num_k8_northbridges. This is required in
    different areas (e.g. L3 cache index disable, GART). But not all AMD
    CPUs provide a GART. Thus it is useful to split off the GART handling
    from the generic caching of AMD northbridge misc devices.

    Signed-off-by: Andreas Herrmann
    LKML-Reference:
    Signed-off-by: H. Peter Anvin

    Andreas Herrmann
     

31 Aug, 2010

8 commits