1. 08 1月, 2013 11 次提交
    • H
      s390/irq: enable irq sum accounting for /proc/stat again · add9bde2
      Heiko Carstens 提交于
      For more than two years, since f2c66cd8
      "/proc/stat: scalability of irq num per cpu" the output of /proc/stat is
      broken.
      The first field in the "intr" line should contain the sum of all interrupts,
      however since the above mentioned change it is always zero.
      
      The reason for that is that a per cpu irq sum variable had been introduced
      which got incremented when calling kstat_incr_irqs_this_cpu(). However
      on s390 we directly incremented only the per cpu per irq counter by accessing
      the array element via kstat_cpu(smp_processor_id()).irqs[...].
      So fix this and use the kstat_incr_irqs_this_cpu() wrapper which increments
      both: the per cpu per irq counter and the per cpu irq sum counter.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      add9bde2
    • H
      1427add0
    • H
      s390/pci: remove dead code · b2034e19
      Heiko Carstens 提交于
      Get rid of these:
      
      arch/s390/pci/pci_dma.c:16:29: warning: ‘zpci_ioat_dt’ defined but not used [-Wunused-variable]
      arch/s390/pci/pci.c:164:12: warning: ‘zpci_store_fib’ defined but not used [-Wunused-function]
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      b2034e19
    • H
      s390/smp: fix section mismatch for smp_add_present_cpu() · eba61970
      Heiko Carstens 提交于
      Fixes this section mismatch:
      
      WARNING: vmlinux.o(.text+0x145e4): Section mismatch in reference from the function
         smp_add_present_cpu() to the function .cpuinit.text:register_cpu()
      The function smp_add_present_cpu() references
      the function __cpuinit register_cpu().
      This is often because smp_add_present_cpu lacks a __cpuinit
      annotation or the annotation of register_cpu is wrong.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      eba61970
    • M
      s390/debug: Fix s390dbf lockdep problem in debug_(un)register_view() · 5a334c08
      Michael Holzheu 提交于
      The debug_register/unregister_view() functions call debugfs_remove()
      while holding the debug_info spinlock. Because debugfs_remove() takes
      a mutex and therefore can sleep this is not allowed. To fix the problem
      we give up the debug_info lock before calling debugfs_remove().
      
      The following shows the lockdep message:
      
      [ INFO: possible circular locking dependency detected ]
      -------------------------------------------------------
      rmmod/4379 is trying to acquire lock:
      (&sb->s_type->i_mutex_key#2){+.+.+.}, at: [<00000000003acae2>] debugfs_remove+0x5e/0xa
      
      but task is already holding lock:
      (&(&rc->lock)->rlock){-.-...}, at: [<000000000010a5ae>] debug_unregister_view+0x3a/0xd
      
      which lock already depends on the new lock.
      
      -> #0 (&sb->s_type->i_mutex_key#2){+.+.+.}:
      [<00000000001b1644>] validate_chain+0x880/0x1154
      [<00000000001b4d6c>] __lock_acquire+0x414/0xc44
      [<00000000001b5c16>] lock_acquire+0xbe/0x178
      [<0000000000614016>] mutex_lock_nested+0x66/0x36c
      [<00000000003acae2>] debugfs_remove+0x5e/0xac
      [<000000000010a620>] debug_unregister_view+0xac/0xd0
      [<000003ff8002f140>] qeth_core_exit+0x48/0xf08 [qeth]
      [<00000000001c35a4>] SyS_delete_module+0x1a4/0x260
      [<0000000000618134>] sysc_noemu+0x22/0x28
      [<000003fffd4704da>] 0x3fffd4704da
      Signed-off-by: NMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      5a334c08
    • L
      Merge tag 'pm+acpi-for-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2a893f91
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - Removal of some ACPICA code that the kernel will never use from Lv
         Zheng.
      
       - APEI fix from Adrian Huang.
      
       - Removal of unnecessary ACPI memory hotplug driver code from Liu
         Jinsong.
      
       - Minor ACPI power management fixes.
      
       - ACPI debug code fix from Joe Perches.
      
       - ACPI fix to make system bus device nodes get the right names.
      
       - PNP resources handling fixes from Witold Szczeponik.
      
       - cpuidle fix for a recent regression stalling boot on systems with
         great numbers of CPUs from Daniel Lezcano.
      
       - cpuidle fixes from Sivaram Nair.
      
       - intel_idle debug message fix from Youquan Song.
      
       - cpufreq build regression fix from Larry Finger.
      
       - cpufreq fix for an obscure initialization race related to statistics
         from Konstantin Khlebnikov.
      
       - cpufreq change disabling the Longhaul driver by default from Rafał
         Bilski.
      
       - PM core fix preventing device suspend errors from happening during
         system suspend due to obscure race conditions.
      
       - PM QoS local variable name cleanup.
      
      * tag 'pm+acpi-for-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM: Move disabling/enabling runtime PM to late suspend/early resume
        PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request()
        ACPI / scan: Do not use dummy HID for system bus ACPI nodes
        cpufreq / governor: Fix problem with cpufreq_ondemand or cpufreq_conservative
        cpufreq / Longhaul: Disable driver by default
        cpufreq / stats: fix race between stats allocation and first usage
        cpuidle: fix lock contention in the idle path
        intel_idle: pr_debug information need separated
        cpuidle / coupled: fix ready counter decrement
        cpuidle: Fix finding state with min power_usage
        PNP: Handle IORESOURCE_BITS in resource allocation
        PNP: Simplify setting of resources
        ACPI / power: Remove useless message from device registering routine
        ACPI / glue: Update DBG macro to include KERN_DEBUG
        ACPI / PM: Do not apply ACPI_SUCCESS() to acpi_bus_get_device() result
        ACPI / memhotplug: remove redundant logic of acpi memory hotadd
        ACPI / APEI: Fix the returned value in erst_dbg_read
        ACPICA: Remove useless mini-C library.
      2a893f91
    • L
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 127aa930
      Linus Torvalds 提交于
      Pull CIFS fixes from Steve French:
       "Misc small cifs fixes"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Don't let read only caching for mandatory byte-range locked files
        CIFS: Fix write after setting a read lock for read oplock files
        Revert "CIFS: Fix write after setting a read lock for read oplock files"
        cifs: adjust sequence number downward after signing NT_CANCEL request
        cifs: move check for NULL socket into smb_send_rqst
      127aa930
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · d287b875
      Linus Torvalds 提交于
      Pull namei.h missing include fix from Al Viro.
      
      The new use of ESTALE in namei.h can cause compile failures on ARM with
      certain configurations due to lack of errno.h.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        namei.h: include errno.h
      d287b875
    • A
      sctp: fix Kconfig bug in default cookie hmac selection · 36a25de2
      Alex Elder 提交于
      Commit 0d0863b0 ("sctp: Change defaults on cookie hmac selection")
      added a "choice" to the sctp Kconfig file.  It introduced a bug which
      led to an infinite loop when while running "make oldconfig".
      
      The problem is that the wrong symbol was defined as the default value
      for the choice.  Using the correct value gets rid of the infinite loop.
      
      Note:  if CONFIG_SCTP_COOKIE_HMAC_SHA1=y was present in the input
      config file, both that and CONFIG_SCTP_COOKIE_HMAC_MD5=y be present
      in the generated config file.
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      36a25de2
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · f7763720
      Linus Torvalds 提交于
      Pull ext4 regression fixes from Ted Ts'o:
       "Bug fixes, including two regressions introduced in v3.8.  The most
        serious of these regressions is a buffer cache leak."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir()
        ext4: release buffer in failed path in dx_probe()
        ext4: fix configuration dependencies for ext4 ACLs and security labels
      f7763720
    • L
      Merge tag 'nfs-for-3.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 4c9014f2
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
      
       - Fix a permissions problem when opening NFSv4 files that only have the
         exec bit set.
      
       - Fix a couple of typos in pNFS (inverted logic), and the mount parsing
         (missing pointer dereference).
      
       - Work around a series of deadlock issues due to workqueues using
         struct work_struct pointer address comparisons in the re-entrancy
         tests.  Ensure that we don't free struct work_struct prematurely if
         our work function involves waiting for completion of other work items
         (e.g. by calling rpc_shutdown_client).
      
       - Revert the part of commit 168e4b39 that is causing unnecessary
         warnings to be issued in the nfsd callback code.
      
      * tag 'nfs-for-3.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: avoid dereferencing null pointer in initiate_bulk_draining
        SUNRPC: Partial revert of commit 168e4b39
        NFS: Ensure that we free the rpc_task after read and write cleanups are done
        SUNRPC: Ensure that we free the rpc_task after cleanups are done
        nfs: fix null checking in nfs_get_option_str()
        pnfs: Increase the refcount when LAYOUTGET fails the first time
        NFS: Fix access to suid/sgid executables
      4c9014f2
  2. 07 1月, 2013 8 次提交
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 5ce2955e
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "Various fixes across the tree.  The modpost error due to
        virt_addr_valid() not being usable from modules required a number of
        preparatory cleanups so a clean fix was possible."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: 64-bit: Fix build if !CONFIG_MODULES
        MIPS: Wire up finit_module syscall.
        MIPS: Fix modpost error in modules attepting to use virt_addr_valid().
        MIPS: page.h: Remove now unnecessary #ifndef __ASSEMBLY__ wrapper.
        MIPS: Switch remaining assembler PAGE_SIZE users to <asm/asm-offsets.h>.
        MIPS: Include PAGE_S{IZE,HIFT} in <asm/offset.h>.
        MIPS: Don't include <asm/page.h> unnecessarily.
        MIPS: Fix comment.
        Revert "MIPS: Optimise TLB handlers for MIPS32/64 R2 cores."
        MIPS: perf: Fix build failure in XLP perf support.
        MIPS: Alchemy: Make 32kHz and r4k timer coexist peacefully
      5ce2955e
    • L
      Merge branch 'akpm' (fixes from Andrew) · d0631c6e
      Linus Torvalds 提交于
      Merge emailed fixes from Andrew Morton:
       "Bunch of fixes:
      
         - delayed IPC updates.  I held back on this because of some possible
           outstanding bug reports, but they appear to have been addressed in
           later versions
      
         - A bunch of MAINTAINERS updates
      
         - Yet Another RTC driver.  I'd held this back while a couple of
           little issues were being worked out.
      
        I'm expecting an intrusive-but-simple patchset from Joe Perches which
        splits up printk.c into kernel/printk/*.  That will be a pig to
        maintain for two months so if it passes testing I'd like to get it
        upstream after a week or so."
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
        printk: fix incorrect length from print_time() when seconds > 99999
        drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time
        drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
        rtc: add RTC driver for TPS6586x
        MAINTAINERS: fix drivers/staging/sm7xx/
        MAINTAINERS: remove include/linux/of_pwm.h
        MAINTAINERS: remove arch/*/lib/perf_event*.c
        MAINTAINERS: remove drivers/mmc/host/imxmmc.*
        MAINTAINERS: fix Documentation/mei/
        MAINTAINERS: remove arch/x86/platform/mrst/pmu.*
        MAINTAINERS: remove firmware/isci/
        MAINTAINERS: fix drivers/ieee802154/
        MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h
        MAINTAINERS: remove drivers/video/epson1355fb.c
        MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb*
        MAINTAINERS: adjust for UAPI
        MAINTAINERS: fix drivers/media/platform/atmel-isi.c
        MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h
        MAINTAINERS: fix drivers/rtc/rtc-vt8500.c
        MAINTAINERS: remove arch/arm/plat-s5p/
        ...
      d0631c6e
    • L
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · de9ac5ce
      Linus Torvalds 提交于
      Pull microblaze update from Michal Simek:
       "This fixes noMMU kernel and I have also added defconfig updates which
        fix issue with one external dependency and enable all xilinx device
        drivers for 0-day testing system.
      
        Additionally wire up finit_module system call, and do highmem fixup
        and pci warnings reported by the 0-day testing system"
      
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Update microblaze defconfigs
        microblaze: Fix pci compilation and sparse warnings
        microblaze: Add finit_module syscall
        microblaze: Kill __kmap_atomic()
        microblaze: Change section flags for noMMU
        microblaze: Microblaze wants sys_fork for noMMU too
      de9ac5ce
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 7991b03d
      Linus Torvalds 提交于
      Pull integrity subsystem regression fix from James Morris:
       "Commit fdf90729 "ima: support new kernel module syscall" by error
        modified init_module() to return INTEGRITY_UNKNOWN (which is 4) to
        user space if the kernel was built with CONFIG_IMA_APPRAISE=y.
      
        As a result, user space can no longer load kernel modules using
        init_module().  This commit fixes this regression."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: fallback to MODULE_SIG_ENFORCE for existing kernel module syscall
      7991b03d
    • G
      ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir() · fef0ebdb
      Guo Chao 提交于
      This fixes a buffer cache leak when creating a directory, introduced
      in commit a774f9c2.
      Signed-off-by: NGuo Chao <yan@linux.vnet.ibm.com>
      Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>
      Reviewed-by: NTao Ma <boyu.mt@taobao.com>
      fef0ebdb
    • G
      ext4: release buffer in failed path in dx_probe() · 0ecaef06
      Guo Chao 提交于
      If checksum fails, we should also release the buffer
      read from previous iteration.
      Signed-off-by: NGuo Chao <yan@linux.vnet.ibm.com>
      Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>
      Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>-
      Cc: stable@vger.kernel.org
      --
       fs/ext4/namei.c |    2 +-
       1 file changed, 1 insertion(+), 1 deletion(-)
      0ecaef06
    • V
      ext4: fix configuration dependencies for ext4 ACLs and security labels · 96465efe
      Valerie Aurora 提交于
      Commit "ext4: Remove CONFIG_EXT4_FS_XATTR" removed the configuration
      dependencies for ext4 xattrs from the ext4 ACLs and security labels
      configuration options, but did not replace them with a dependency on
      ext4 itself.  Add back the dependency on ext4 so the options only show
      up if ext4 is enabled.
      Signed-off-by: NValerie Aurora <val@vaaconsulting.com>
      Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>
      Reviewed-by: NTao Ma <boyu.mt@taobao.com>
      96465efe
    • J
      Merge branch 'for-Linus' of... · ade24c93
      James Morris 提交于
      Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      
      Pulled from Mimi's tree.
      ade24c93
  3. 06 1月, 2013 7 次提交
  4. 05 1月, 2013 14 次提交