]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 13 Sep 2011 03:06:02 +0000 (13:06 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
Stephen Rothwell [Tue, 13 Sep 2011 02:53:49 +0000 (12:53 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 13 Sep 2011 02:51:44 +0000 (12:51 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:51:40 +0000 (12:51 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:51:34 +0000 (12:51 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:50:09 +0000 (12:50 +1000)]
Merge remote-tracking branch 'acpi/test'
Stephen Rothwell [Tue, 13 Sep 2011 02:48:51 +0000 (12:48 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 13 Sep 2011 02:48:46 +0000 (12:48 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:47:23 +0000 (12:47 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:46:04 +0000 (12:46 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Tue, 13 Sep 2011 02:44:53 +0000 (12:44 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Tue, 13 Sep 2011 02:43:41 +0000 (12:43 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:42:27 +0000 (12:42 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 13 Sep 2011 02:41:08 +0000 (12:41 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 13 Sep 2011 02:39:55 +0000 (12:39 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Tue, 13 Sep 2011 02:38:39 +0000 (12:38 +1000)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Stephen Rothwell [Tue, 13 Sep 2011 02:37:10 +0000 (12:37 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_super.c
Stephen Rothwell [Tue, 13 Sep 2011 02:35:56 +0000 (12:35 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Conflicts:
net/9p/trans_virtio.c
Stephen Rothwell [Tue, 13 Sep 2011 02:34:27 +0000 (12:34 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:28:33 +0000 (12:28 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:27:20 +0000 (12:27 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:26:07 +0000 (12:26 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:24:55 +0000 (12:24 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:23:37 +0000 (12:23 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 13 Sep 2011 02:22:21 +0000 (12:22 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:21:08 +0000 (12:21 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:19:57 +0000 (12:19 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:18:47 +0000 (12:18 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 13 Sep 2011 02:17:35 +0000 (12:17 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 13 Sep 2011 02:16:24 +0000 (12:16 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Tue, 13 Sep 2011 02:15:07 +0000 (12:15 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 13 Sep 2011 02:13:49 +0000 (12:13 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 13 Sep 2011 02:12:34 +0000 (12:12 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 13 Sep 2011 02:11:22 +0000 (12:11 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 13 Sep 2011 02:11:19 +0000 (12:11 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Conflicts:
arch/openrisc/kernel/signal.c
Stephen Rothwell [Tue, 13 Sep 2011 02:06:20 +0000 (12:06 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:05:02 +0000 (12:05 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:03:52 +0000 (12:03 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 13 Sep 2011 02:02:40 +0000 (12:02 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Tue, 13 Sep 2011 02:01:21 +0000 (12:01 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 13 Sep 2011 02:00:03 +0000 (12:00 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 13 Sep 2011 01:58:51 +0000 (11:58 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 13 Sep 2011 01:57:41 +0000 (11:57 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Tue, 13 Sep 2011 01:56:28 +0000 (11:56 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
Stephen Rothwell [Tue, 13 Sep 2011 01:54:47 +0000 (11:54 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Tue, 13 Sep 2011 01:54:44 +0000 (11:54 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 13 Sep 2011 01:49:07 +0000 (11:49 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Tue, 13 Sep 2011 01:37:21 +0000 (11:37 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
Stephen Rothwell [Tue, 13 Sep 2011 01:36:02 +0000 (11:36 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 13 Sep 2011 01:34:36 +0000 (11:34 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 13 Sep 2011 01:34:33 +0000 (11:34 +1000)]
Merge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Tue, 13 Sep 2011 01:34:32 +0000 (11:34 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 13 Sep 2011 01:34:31 +0000 (11:34 +1000)]
Merge remote-tracking branch 'net-current/master'
Stephen Rothwell [Tue, 13 Sep 2011 01:34:30 +0000 (11:34 +1000)]
Merge remote-tracking branch 'scsi-rc-fixes/master'
Richard Kuo [Tue, 13 Sep 2011 00:38:05 +0000 (10:38 +1000)]
Add extra arch overrides to asm-generic/checksum.h
There are plausible reasons for architectures to provide their own
versions of csum_partial_copy_nocheck and csum_tcpudp_magic.
By protecting these, the architecture can still re-use the
asm-generic checksum.h, instead of copying it.
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:05 +0000 (10:38 +1000)]
Hexagon: Add self to MAINTAINERS
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:38:04 +0000 (10:38 +1000)]
Hexagon: Add basic stacktrace functionality for Hexagon architecture.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:04 +0000 (10:38 +1000)]
Hexagon: Add configuration and makefiles for the Hexagon architecture.
Removed CONFIG_ARCH_HAS_KMAP
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:04 +0000 (10:38 +1000)]
Hexagon: Comet platform support
Used the shortened version of the config; other platform stuff moved out until
it's ready.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +1000)]
Hexagon: kgdb support files
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +1000)]
Hexagon: Add page-fault support.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +1000)]
Hexagon: Add page table header files & etc.
Removed highmem more highmem stuff.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +1000)]
Hexagon: Add ioremap support
Removed redundant flush_cache_vmap.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:38:02 +0000 (10:38 +1000)]
Hexagon: Provide DMA implementation
Basic DMA implementation for our architecture.
Added sync_single_for_* routines; hexagon_map_page() still seems to be a
convenient place to flush/invalidate.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:02 +0000 (10:38 +1000)]
Hexagon: Implement basic TLB management routines for Hexagon.
Mostly all stubs, as the TLB is managed by the hypervisor.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:02 +0000 (10:38 +1000)]
Hexagon: Implement basic cache-flush support
We have separate I/D caches. Data caches are physically indexed.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:01 +0000 (10:38 +1000)]
Hexagon: Provide basic implementation and/or stubs for I/O routines.
Filled in the ins/outs; leaving them in for now.
Change _IO_BASE and IO_SPACE_LIMIT for safety.
I have compiled this with sparse and it builds; I've also picked over
various files related to the HAS_IOPORT_MAP from arm-soc.git and
tried them out, and they work, so I guess we'll just wait until
they're merged.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:38:01 +0000 (10:38 +1000)]
Hexagon: Add user access functions
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:01 +0000 (10:38 +1000)]
Hexagon: Add locking types and functions
Moved rwsem to asm-generic. Will submit a subsequent patch for PPC
use it from the new location.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:38:00 +0000 (10:38 +1000)]
Hexagon: Add SMP support
Changed smp.c to use generic IPI handler functions.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:38:00 +0000 (10:38 +1000)]
Hexagon: Provide basic debugging and system trap support.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:38:00 +0000 (10:38 +1000)]
Hexagon: Add ptrace support
Will look at the more generic ptrace support in the future.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +1000)]
Hexagon: Add time and timer functions
Cleaned up iomem and register declarations, unnecessary
SMP ifdefs, cpu_relax() in udelay.
Platform stuff is in development; platform defines will be cleaned up.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +1000)]
Hexagon: Add interrupts
Removed init_IRQ wrapper and fixed up some comments.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +1000)]
Hexagon: Add startup code
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +1000)]
Hexagon: Add init_task and process functions
Fixed potential race-to-sleep condition in cpu_idle() and calling schedule
with irq's disabled. I still have to have that extra enable/disbale in the
while() loop else the interrupt never gets serviced, and thus need_resched()
will always be false.
If called with interrupts disabled, our __vmwait() actually just returns
without servicing it.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:58 +0000 (10:37 +1000)]
Hexagon: Add signal functions
Added vDSO support; signal trampoline is no longer on the stack
so it no longer needs to be executable.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:37:58 +0000 (10:37 +1000)]
Hexagon: Support dynamic module loading.
Modules should be compiled as ordinary .o's; shared objects are not
supported.
Deleted module functions that already have generic equivalents.
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:58 +0000 (10:37 +1000)]
Hexagon: Export ksyms defined in assembly files.
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:57 +0000 (10:37 +1000)]
Hexagon: Add hypervisor interface
The port of Linux for Hexagon runs on top of a hypervisor layer,
which presents an interface for memory management, events, hardware
control, etc.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:57 +0000 (10:37 +1000)]
Hexagon: Add memcpy and memset accelerated functions
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:57 +0000 (10:37 +1000)]
Hexagon: Add checksum functions
Removed most non-assembly functions and use the generic ones instead.
Made a few more minor changes to use the generic header file.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:56 +0000 (10:37 +1000)]
Hexagon: Add delay functions
Added read_current_timer elsewhere.
udelay is based off of __vmgettime() which returns processor ticks.
Removed __delay and CONFIG_GENERIC_CALIBRATE_DELAY.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:37:56 +0000 (10:37 +1000)]
Hexagon: Add threadinfo
Removed some cruft and changed to allow kernel stack to be smaller than a page
size.
I left the thread_info alignment alone for the time being; may revisit that in
the future.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:56 +0000 (10:37 +1000)]
Hexagon: Add processor and system headers
Adds Hexagon information for processor/system type stuff
like context switching, register access, and irqflags.
Changed cpu_relax() to call __vmyield().
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:55 +0000 (10:37 +1000)]
Hexagon: Add syscalls
Removed sys_mmap* and replaced with sys_mmap_pgoff()
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Richard Kuo [Tue, 13 Sep 2011 00:37:55 +0000 (10:37 +1000)]
Hexagon: Add atomic ops support
Our architecture uses load locked/store conditional type semantics for atomic
ops.
Added inline assembly version of atomic_add_unless.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:54 +0000 (10:37 +1000)]
Hexagon: Add bitops support
Merged sub-files into bitops.h; fixed return types and volatiles.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:52 +0000 (10:37 +1000)]
Hexagon: Core arch-specific header files
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Richard Kuo [Tue, 13 Sep 2011 00:37:49 +0000 (10:37 +1000)]
Hexagon: Add generic headers
Reworked to use the Kbuild generic headers mechanism.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Linus Torvalds [Mon, 12 Sep 2011 21:02:02 +0000 (14:02 -0700)]
Linux 3.1-rc6
Linus Torvalds [Mon, 12 Sep 2011 20:49:07 +0000 (13:49 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm: Remove duplicate "return" statement
drm/nv04/crtc: Bail out if FB is not bound to crtc
drm/nouveau: fix nv04_sgdma_bind on non-"4kB pages" archs
drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate
drm/nouveau: fix oops on pre-semaphore hardware
drm/nv50/crtc: Bail out if FB is not bound to crtc
drm/radeon/kms: fix DP detect and EDID fetch for DP bridges
Linus Torvalds [Mon, 12 Sep 2011 18:51:35 +0000 (11:51 -0700)]
Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
ARM: CSR: add missing sentinels to of_device_id tables
ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
ARM: cns3xxx: Fix compile error caused by hardware.h removed
ARM: davinci: fix cache flush build error
ARM: davinci: correct MDSTAT_STATE_MASK
ARM: davinci: da850 EVM: read mac address from SPI flash
OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
OMAP4: clock: fix compile warning
OMAP4: clock: re-enable previous clockdomain enable/disable sequence
OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
OMAP: powerdomains: Make all powerdomain target states as ON at init
Mathieu Desnoyers [Sun, 11 Sep 2011 21:59:04 +0000 (17:59 -0400)]
ioctl: register LTTng ioctl
The LTTng 2.0 kernel tracer (stand-alone module package, available at
http://lttng.org) uses the 0xF6 ioctl range for tracer control and
transport operations.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Mon, 12 Sep 2011 18:47:49 +0000 (11:47 -0700)]
Merge branch 'for-linus' of git://github.com/chrismason/linux
* 'for-linus' of git://github.com/chrismason/linux:
Btrfs: add dummy extent if dst offset excceeds file end in
Btrfs: calc file extent num_bytes correctly in file clone
btrfs: xattr: fix attribute removal
Btrfs: fix wrong nbytes information of the inode
Btrfs: fix the file extent gap when doing direct IO
Btrfs: fix unclosed transaction handle in btrfs_cont_expand
Btrfs: fix misuse of trans block rsv
Btrfs: reset to appropriate block rsv after orphan operations
Btrfs: skip locking if searching the commit root in csum lookup
btrfs: fix warning in iput for bad-inode
Btrfs: fix an oops when deleting snapshots
Miklos Szeredi [Mon, 12 Sep 2011 07:38:03 +0000 (09:38 +0200)]
fuse: fix memory leak
kmemleak is reporting that 32 bytes are being leaked by FUSE:
unreferenced object 0xe373b270 (size 32):
comm "fusermount", pid 1207, jiffies
4294707026 (age 2675.187s)
hex dump (first 32 bytes):
01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<
b05517d7 >] kmemleak_alloc+0x27/0x50
[<
b0196435 >] kmem_cache_alloc+0xc5/0x180
[<
b02455be >] fuse_alloc_forget+0x1e/0x20
[<
b0245670 >] fuse_alloc_inode+0xb0/0xd0
[<
b01b1a8c >] alloc_inode+0x1c/0x80
[<
b01b290f >] iget5_locked+0x8f/0x1a0
[<
b0246022 >] fuse_iget+0x72/0x1a0
[<
b02461da >] fuse_get_root_inode+0x8a/0x90
[<
b02465cf >] fuse_fill_super+0x3ef/0x590
[<
b019e56f >] mount_nodev+0x3f/0x90
[<
b0244e95 >] fuse_mount+0x15/0x20
[<
b019d1bc >] mount_fs+0x1c/0xc0
[<
b01b5811 >] vfs_kern_mount+0x41/0x90
[<
b01b5af9 >] do_kern_mount+0x39/0xd0
[<
b01b7585 >] do_mount+0x2e5/0x660
[<
b01b7966 >] sys_mount+0x66/0xa0
This leak report is consistent and happens once per boot on
3.1.0-rc5-dirty.
This happens if a FORGET request is queued after the fuse device was
released.
Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Miklos Szeredi [Mon, 12 Sep 2011 07:31:49 +0000 (09:31 +0200)]
fuse: fix flock breakage
Commit
37fb3a30b4 ("fuse: fix flock") added in 3.1-rc4 caused flock() to
fail with ENOSYS with the kernel ABI version 7.16 or earlier.
Fix by falling back to testing FUSE_POSIX_LOCKS for ABI versions 7.16
and earlier.
Reported-by: Martin Ziegler <ziegler@email.mathematik.uni-freiburg.de>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Martin Ziegler <ziegler@email.mathematik.uni-freiburg.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Arnd Bergmann [Mon, 12 Sep 2011 18:30:22 +0000 (20:30 +0200)]
Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes
Arnd Bergmann [Mon, 12 Sep 2011 15:06:58 +0000 (15:06 +0000)]
Merge branches 'fixes' and 'next/devel' into for-next
Arnd Bergmann [Mon, 12 Sep 2011 15:05:23 +0000 (15:05 +0000)]
Merge branch 'sirf/devel' into next/devel