1. 08 1月, 2013 6 次提交
    • H
      s390/irq: remove split irq fields from /proc/stat · 420f42ec
      Heiko Carstens 提交于
      Now that irq sum accounting for /proc/stat's "intr" line works again we
      have the oddity that the sum field (first field) contains only the sum
      of the second (external irqs) and third field (I/O interrupts).
      The reason for that is that these two fields are already sums of all other
      fields. So if we would sum up everything we would count every interrupt
      twice.
      This is broken since the split interrupt accounting was merged two years
      ago: 052ff461 "[S390] irq: have detailed
      statistics for interrupt types".
      To fix this remove the split interrupt fields from /proc/stat's "intr"
      line again and only have them in /proc/interrupts.
      
      This restores the old behaviour, seems to be the only sane fix and mimics
      a behaviour from other architectures where /proc/interrupts also contains
      more than /proc/stat's "intr" line does.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      420f42ec
    • 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
  2. 04 1月, 2013 12 次提交
    • C
      arm64: Always select ARM_AMBA and GENERIC_GPIO · 25c92a37
      Catalin Marinas 提交于
      Needed for most SoCs.
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      25c92a37
    • M
      microblaze: Update microblaze defconfigs · d0e04540
      Michal Simek 提交于
      The main reason is 0-day testing system which can directly
      use these defconfigs for testing.
      
      Enable support for all xilinx drivers which Microblaze
      can use and disable dependency on external rootfs.cpio.
      There is only one exception which is axi ethernet driver
      which still uses NO_IRQ which is not defined for Microblaze.
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      d0e04540
    • M
      microblaze: Fix pci compilation and sparse warnings · f7eaacc1
      Michal Simek 提交于
      Warning log:
        CHECK   arch/microblaze/pci/pci-common.c
      arch/microblaze/pci/pci-common.c:290:14: warning: Using plain integer as NULL pointer
      arch/microblaze/pci/pci-common.c:1127:6: warning: symbol
      'pcibios_allocate_bus_resources' was not declared. Should it be static?
      arch/microblaze/pci/pci-common.c:1436:61: warning: incorrect type in argument 3 (different base types)
      arch/microblaze/pci/pci-common.c:1436:61:    expected unsigned int [unsigned] [usertype] offset
      arch/microblaze/pci/pci-common.c:1436:61:    got void [noderef] <asn:2>*
        CC      arch/microblaze/pci/pci-common.o
      arch/microblaze/pci/pci-common.c: In function 'pci_proc_domain':
      arch/microblaze/pci/pci-common.c:825:25: warning: unused variable 'hose' [-Wunused-variable]
      arch/microblaze/pci/pci-common.c: In function 'pcibios_allocate_bus_resources':
      arch/microblaze/pci/pci-common.c:1182:1: warning: label 'clear_resource' defined but not used [-Wunused-label]
      arch/microblaze/pci/pci-common.c: In function 'pcibios_setup_phb_resources':
      arch/microblaze/pci/pci-common.c:1436:2: warning: passing argument 3 of
      'pci_add_resource_offset' makes integer from pointer without a cast [enabled by default]
      include/linux/pci.h:999:6: note: expected 'resource_size_t' but argument is of type 'void *'
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      f7eaacc1
    • G
      ARCH: drivers remove __dev* attributes. · b881bc46
      Greg Kroah-Hartman 提交于
      This fixes up all of the smaller arches that had __dev* markings for
      their platform-specific drivers.
      
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      __devinitconst, and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
      Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
      Cc: Mike Frysinger <vapier@gentoo.org>
      Cc: Mikael Starvik <starvik@axis.com>
      Cc: Jesper Nilsson <jesper.nilsson@axis.com>
      Cc: David Howells <dhowells@redhat.com>
      Cc: Hirokazu Takata <takata@linux-m32r.org>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
      Cc: Jonas Bonn <jonas@southpole.se>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Cc: Helge Deller <deller@gmx.de>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Chen Liqin <liqin.chen@sunplusct.com>
      Cc: Lennox Wu <lennox.wu@gmail.com>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Cc: Chris Metcalf <cmetcalf@tilera.com>
      Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
      Cc: Bob Liu <lliubbo@gmail.com>
      Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
      Cc: Bjorn Helgaas <bhelgaas@google.com>
      Cc: Myron Stowe <myron.stowe@redhat.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
      Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
      Cc: Yinghai Lu <yinghai@kernel.org>
      Cc: Thierry Reding <thierry.reding@avionic-design.de>
      Cc: Greg Ungerer <gerg@uclinux.org>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Yong Zhang <yong.zhang0@gmail.com>
      Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
      Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
      Cc: Jan Glauber <jang@linux.vnet.ibm.com>
      Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
      Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b881bc46
    • G
      ALPHA: drivers: remove __dev* attributes. · f8d6c8d9
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      f8d6c8d9
    • G
      IA64: drivers: remove __dev* attributes. · 5b5e76e9
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Tony Luck <tony.luck@intel.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      5b5e76e9
    • G
      MIPS: drivers: remove __dev* attributes. · 28eb0e46
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      28eb0e46
    • G
      POWERPC: drivers: remove __dev* attributes. · cad5cef6
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      __devinitconst, and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      cad5cef6
    • G
      SPARC: drivers: remove __dev* attributes. · 7c9503b8
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      7c9503b8
    • G
      X86: drivers: remove __dev* attributes. · a18e3690
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitconst,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Daniel Drake <dsd@laptop.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      a18e3690
    • G
      ARM: drivers: remove __dev* attributes. · 351a102d
      Greg Kroah-Hartman 提交于
      CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
      markings need to be removed.
      
      This change removes the use of __devinit, __devexit_p, __devinitdata,
      and __devexit from these drivers.
      
      Based on patches originally written by Bill Pemberton, but redone by me
      in order to handle some of the coding style issues better, by hand.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Russell King <linux@arm.linux.org.uk>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      351a102d
    • L
      Wire up finit_module syscall · 062fe95a
      Luck, Tony 提交于
      Linux was granted a new system call to load modules by file descriptor
      in commit 34e1169d ("module: add syscall to load module from fd").
      
      Wire it up for ia64 (ready for the Chrome port :-)
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      062fe95a
  3. 03 1月, 2013 7 次提交
    • M
      microblaze: Add finit_module syscall · 0e1ec2d0
      Michal Simek 提交于
      Add finit_module syscall to the syscall list.
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      0e1ec2d0
    • M
      microblaze: Kill __kmap_atomic() · ffed2b4f
      Michal Simek 提交于
      This should be the part of this patch:
      "highmem: kill all __kmap_atomic()"
      (sha1: a24401bc)
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      ffed2b4f
    • M
      microblaze: Change section flags for noMMU · 7e278157
      Michal Simek 提交于
      All files which uses user unified macros from uaccess.h
      (get_user/put_user/clear_user/copy_tofrom_user/
      strnlen_user and strncpy_user) generate this
      warning messages:
      Assembler messages:
      Warning: ignoring changed section attributes for .discard
      
      Setting up discard executable section flang for __EX_TABLE_SECTION
      macro removed all these warnings.
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      7e278157
    • M
      microblaze: Microblaze wants sys_fork for noMMU too · ca073b4a
      Michal Simek 提交于
      The patch "generic sys_fork / sys_vfork / sys_clone"
      (sha1: d2125043)
      introduced generic sys_fork with implementation for noMMU
      which returns EINVAL for noMMU.
      
      and the patch "microblaze: switch to generic fork/vfork/clone"
      (sha1: f3268edb)
      enable sys_fork only for MMU which is causing compilation
      failure on noMMU system.
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      ca073b4a
    • G
      powerpc: Add missing NULL terminator to avoid boot panic on PPC40x · e6449c9b
      Gabor Juhos 提交于
      The missing NULL terminator can cause a panic on
      PPC405 boards during boot:
      
        Linux/PowerPC load: console=ttyS0,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd init=/etc/preinit
        Finalizing device tree... flat tree at 0x6a5160
        bootconsole [udbg0] enabled
        Page fault in user mode with in_atomic() = 1 mm = (null)
        NIP = c0275f50  MSR = fffffffe
        Oops: Weird page fault, sig: 11 [#1]
        PowerPC 40x Platform
        Modules linked in:
        NIP: c0275f50 LR: c0275f60 CTR: c0280000
        REGS: c0275eb0 TRAP: 636f7265   Not tainted  (3.7.1)
        MSR: fffffffe <VEC,VSX,EE,PR,FP,ME,SE,BE,IR,DR,PMM,RI> CR: c06a6190  XER: 00000001
        TASK = c02662a8[0] 'swapper' THREAD: c0274000
        GPR00: c0275ec0 c000c658 c027c4bf 00000000 c0275ee0 c000a0ec c020a1a8 c020a1f0
        GPR08: c020f631 c020f404 c025f078 c025f080 c0275f10
         Call Trace:
         ---[ end trace 31fd0ba7d8756001 ]---
      
        Kernel panic - not syncing: Attempted to kill the idle task!
      
      The panic happens since commit 9597abe0
      (sections: fix section conflicts in arch/powerpc), however the root
      cause of this is that the NULL terminator were not added in commit
      a4f740cf (of/flattree: Add of_flat_dt_match()
      helper function).
      
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NGabor Juhos <juhosg@openwrt.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e6449c9b
    • S
      powerpc/vdso: Remove redundant locking in update_vsyscall_tz() · ce73ec6d
      Shan Hai 提交于
      The locking in update_vsyscall_tz() is not only unnecessary because the vdso
      code copies the data unproteced in __kernel_gettimeofday() but also
      introduces a hard to reproduce race condition between update_vsyscall()
      and update_vsyscall_tz(), which causes user space process to loop
      forever in vdso code.
      
      The following patch removes the locking from update_vsyscall_tz().
      
      Locking is not only unnecessary because the vdso code copies the data
      unprotected in __kernel_gettimeofday() but also erroneous because updating
      the tb_update_count is not atomic and introduces a hard to reproduce race
      condition between update_vsyscall() and update_vsyscall_tz(), which further
      causes user space process to loop forever in vdso code.
      
      The below scenario describes the race condition,
      x==0	Boot CPU			other CPU
      	proc_P: x==0
      	    timer interrupt
      		update_vsyscall
      x==1		    x++;sync		settimeofday
      					    update_vsyscall_tz
      x==2						x++;sync
      x==3		    sync;x++
      						sync;x++
      	proc_P: x==3 (loops until x becomes even)
      
      Because the ++ operator would be implemented as three instructions and not
      atomic on powerpc.
      
      A similar change was made for x86 in commit 6c260d58
      ("x86: vdso: Remove bogus locking in update_vsyscall_tz")
      Signed-off-by: NShan Hai <shan.hai@windriver.com>
      CC: <stable@vger.kernel.org>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      ce73ec6d
    • J
      MIPS: 64-bit: Fix build if !CONFIG_MODULES · 2f12fb20
      Joshua Kinard 提交于
      Fix build failure if building a monolithic kernel due to
      arch/mips/kernel/Kconfig selecting MODULES_USE_ELF_REL[A] without checking
      to see if MODULES is set or not.  This leads to 'struct module' not
      existing, which triggers a compile failure in arch/mips/kernel/module-rela.c
      when the compiler attempts to dereference me->name:
      
        CC      arch/mips/kernel/module-rela.o
      arch/mips/kernel/module-rela.c: In function ‘apply_r_mips_26_rela’:
      arch/mips/kernel/module-rela.c:38:74: error: dereferencing pointer to incomplete type
      arch/mips/kernel/module-rela.c:46:12: error: dereferencing pointer to incomplete type
      arch/mips/kernel/module-rela.c: In function ‘apply_relocate_add’:
      arch/mips/kernel/module-rela.c:133:13: error: dereferencing pointer to incomplete type
      make[2]: *** [arch/mips/kernel/module-rela.o] Error 1
      Signed-off-by: NJoshua Kinard <kumba@gentoo.org>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/4749/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      2f12fb20
  4. 02 1月, 2013 3 次提交
  5. 29 12月, 2012 6 次提交
  6. 27 12月, 2012 5 次提交
  7. 26 12月, 2012 1 次提交