1. 20 Dec, 2010 2 commits
  2. 19 Dec, 2010 3 commits
  3. 18 Dec, 2010 3 commits
  4. 17 Dec, 2010 23 commits
  5. 16 Dec, 2010 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify · a3383e83
      Linus Torvalds authored
      * 'for-linus' of git://git.infradead.org/users/eparis/notify:
        fanotify: fill in the metadata_len field on struct fanotify_event_metadata
        fanotify: split version into version and metadata_len
        fanotify: Dont try to open a file descriptor for the overflow event
        fanotify: Introduce FAN_NOFD
        fanotify: do not leak user reference on allocation failure
        inotify: stop kernel memory leak on file creation failure
        fanotify: on group destroy allow all waiters to bypass permission check
        fanotify: Dont allow a mask of 0 if setting or removing a mark
        fanotify: correct broken ref counting in case adding a mark failed
        fanotify: if set by user unset FMODE_NONOTIFY before fsnotify_perm() is called
        fanotify: remove packed from access response message
        fanotify: deny permissions when no event was sent
      a3383e83
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus · 68a4ec9c
      Linus Torvalds authored
      * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (28 commits)
        MIPS: Add a CONFIG_FORCE_MAX_ZONEORDER Kconfig option.
        MIPS: LD/SD o32 macro GAS fix update
        MIPS: Alchemy: fix build with SERIAL_8250=n
        MIPS: Rename mips_dma_cache_sync back to dma_cache_sync
        MIPS: MT: Fix typo in comment.
        SSB: Fix nvram_get on BCM47xx platform
        MIPS: BCM47xx: Swap serial console if ttyS1 was specified.
        MIPS: BCM47xx: Use sscanf for parsing mac address
        MIPS: BCM47xx: Fill values for b43 into SSB sprom
        MIPS: BCM47xx: Do not read config from CFE
        MIPS: FDT size is a be32
        MIPS: Fix CP0 COUNTER clockevent race
        MIPS: Fix regression on BCM4710 processor detection
        MIPS: JZ4740: Fix pcm device name
        MIPS: Separate two consecutive loads in memset.S
        MIPS: Send proper signal and siginfo on FP emulator faults.
        MIPS: AR7: Fix loops per jiffies on TNETD7200 devices
        MIPS: AR7: Fix double ar7_gpio_init declaration
        MIPS: Rework GENERIC_HARDIRQS Kconfig.
        MIPS: Alchemy: Add return value check for strict_strtoul()
        ...
      68a4ec9c
    • Neil Horman's avatar
      PCI: Update MCP55 quirk to not affect non HyperTransport variants · 49c2fa08
      Neil Horman authored
      I wrote this quirk awhile ago to properly setup MCP55 chips on hypertransport
      busses so that interrupts reached whatever cpu happend to boot the kdump kernel.
      while that works well, it was recently shown to me that a a non-hypertransport
      variant of the MCP55 exists, and on those system the register that this quirk
      manipulates causes hangs if you write to it.  Since the quirk was only meant to
      handle errors found on MCP55 chips that have a HT interface, this patch adds a
      filter to make sure the chip is an HT capable before making the needed register
      adjustment.  This lets the broken MCP55s work with kdump while not breaking the
      non-HT variants.
      
      Resolves https://bugzilla.kernel.org/show_bug.cgi?id=23952
      
      Tested successfully by the reporter and myself.
      
      Cc: stable@kernel.org
      Reported-by: default avatarMathieu Bérard <mathieu@mberard.eu>
      Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
      Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      49c2fa08
    • David Daney's avatar
      MIPS: Add a CONFIG_FORCE_MAX_ZONEORDER Kconfig option. · c9bace7c
      David Daney authored
      For huge page support with base page size of 16K or 32K, we have to
      increase the MAX_ORDER so that huge pages can be allocated.
      
      [Ralf: I don't think a user should have to configure obscure constants like
      this but for the time being this will have to suffice.]
      Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
      To: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/1685/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c9bace7c
    • Maciej W. Rozycki's avatar
      MIPS: LD/SD o32 macro GAS fix update · 82b89152
      Maciej W. Rozycki authored
      I am about to commit:
      
      http://sourceware.org/ml/binutils/2010-10/msg00033.html
      
      that fixes a problem with the LD/SD macro currently implemented by GAS for
      the o32 ABI in an inconsistent way.  This is best illustrated with a
      simple program, which I'm copying here from the message above for easier
      reference:
      
      $ cat ld.s
      	ld	$5,32767($4)
      	ld	$5,32768($4)
      
      This gets assebled into the following output:
      
      $ mips-linux-as -32 -mips3 -o ld.o ld.s
      $ mips-linux-objdump -d ld.o
      
      ld.o:     file format elf32-tradbigmips
      
      Disassembly of section .text:
      
      00000000 <.text>:
         0:	dc857fff 	ld	a1,32767(a0)
         4:	3c010001 	lui	at,0x1
         8:	00810821 	addu	at,a0,at
         c:	8c258000 	lw	a1,-32768(at)
        10:	8c268004 	lw	a2,-32764(at)
      	...
      
      Oops!
      
       The GAS fix makes the macro behave in a consistent way and pairs of LW/SW
      instructions to be output as appropriate regardless of the size of the
      offset associated with the address used.  The machine instruction is still
      available, but to reach it macros have to be disabled first.  This has a
      side effect of requiring the use of a machine-addressable memory operand.
      
       As some platforms require 64-bit operations for accesses to some I/O
      registers LD/SD instructions are used in a couple of places in Linux
      regardless of the ABI selected.  Here's a fix for some pieces of code
      affected I've been able to track down.  The fix should be backwards
      compatible with all supported binutils releases in existence and can be
      used as a reference for any other places or off-tree code.  The use of the
      "R" constraint guarantees a machine-addressable operand.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/1680/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      82b89152
    • Manuel Lauss's avatar
      MIPS: Alchemy: fix build with SERIAL_8250=n · cf745a39
      Manuel Lauss authored
      In commit 7d172bfe ("Alchemy: Add UART PM methods") I introduced
      platform PM methods which call a function of the 8250 driver;
      this patch works around link failures when the kernel is built
      without 8250 support.
      Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
      To: Linux-MIPS <linux-mips@linux-mips.org>
      Patchwork: https://patchwork.linux-mips.org/patch/1737/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      cf745a39
    • Ralf Baechle's avatar
      MIPS: Rename mips_dma_cache_sync back to dma_cache_sync · a3aad4aa
      Ralf Baechle authored
      This fixes IP22 and IP28 build errors.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      a3aad4aa
    • Ralf Baechle's avatar
      MIPS: MT: Fix typo in comment. · d002aaad
      Ralf Baechle authored
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      d002aaad
    • Hauke Mehrtens's avatar
      SSB: Fix nvram_get on BCM47xx platform · 3f84622d
      Hauke Mehrtens authored
      The nvram_get function was never in the mainline kernel, it only existed in
      an external OpenWrt patch. Use nvram_getenv function, which is in mainline
      and use an include instead of an extra function declaration.  et0macaddr
      contains the mac address in text from like 00:11:22:33:44:55. We have to
      parse it before adding it into macaddr.
      
      nvram_parse_macaddr will be merged into asm/mach-bcm47xx/nvram.h through
      the MIPS git tree and will be available soon. It will not build now without
      nvram_parse_macaddr, but it hasn't before either.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      To: linux-mips@linux-mips.org
      Cc: mb@bu3sch.de
      Cc: netdev@vger.kernel.org
      Cc: Hauke Mehrtens <hauke@hauke-m.de>
      Acked-by: default avatarMichael Buesch <mb@bu3sch.de>
      Patchwork: https://patchwork.linux-mips.org/patch/1849/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      3f84622d