aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-10-09Merge tag 'omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3' of ↵Olof Johansson6-30/+54
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes From Paul Walmsley <[email protected]> via Tony Lindgren: Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch integration issues, and bugs after the arm-soc merges. * tag 'omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling ARM: OMAP3: fix workaround for EMU clockdomain ARM: OMAP: omap3evm: fix new sparse warning ARM: OMAP2+: hwmod data: Fix PMU interrupt definitions ARM: am33xx: clk: Update clkdev table to add mcasp alias
2012-10-09Merge tag 'omap-for-v3.7-rc1/fixes-signed' of ↵Olof Johansson20-37/+42
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes From Tony Lindgren: This branch contains one counter locking fix and an alignment fix. Other fixes are warning fixes, fixes for return value checks. I've also included removal of some extra semicolons, dropping of some duplicate includes, and an a change for wl12xx enumeration that are not strictly fixes but would be good to get out of the way for -rc1. * tag 'omap-for-v3.7-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: arm/omap: Replace board_ref_clock with enum values ARM: OMAP2+: remove duplicated include from board-omap3stalker.c arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon arch/arm/mach-omap2: Remove unecessary semicolon arch/arm/mach-omap1/devices.c: Remove unecessary semicolon AM35xx: Add missing hwmod entry for the HDQ/1-Wire present in AM3505/3517 CPUs. ARM: OMAP2+: gpmc: annotate exit sections properly ARM: OMAP: fix return value check in realtime_counter_init() ARM: OMAP: hsmmc: fix return value check in omap_hsmmc_init_one() OMAPDSS: fix return value check in create_dss_pdev() ARM: OMAP2+: Add am335x evm and bone targets to common Makefile arm: increase FORCE_MAX_ZONEORDER for TI AM33XX ARM: OMAP: OMAP_DEBUG_LEDS needs to select LEDS_CLASS ARM: OMAP: rx51: Fix a section mismatch warn ARM: OMAP2+: Round of the carve out memory requested to section_size ARM: OMAP: counter: add locking to read_persistent_clock
2012-10-09typo in UserModeLinux-HOWTORichard Genoud1-1/+1
[it seems that I sent it to the wrong maintainer at first... sorry for that] copy_from_user was meant instead of copy_to_user. Signed-off-by: Richard Genoud <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
2012-10-09hppfs: fix the return value of get_inode()Wei Yongjun1-1/+1
In case of error, the function get_inode() returns ERR_PTR(). But the users hppfs_lookup() and hppfs_fill_super() use NULL test for check the return value, not IS_ERR(), so we'd better change the return value of get_inode() to NULL instead of ERR_PTR(). dpatch engine is used to generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
2012-10-09hostfs: drop vmtruncateMarco Stornelli1-3/+5
Removed vmtruncate. Signed-off-by: Marco Stornelli <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
2012-10-09um: get rid of pointless include "..." where include <...> will doAl Viro144-429/+428
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
2012-10-09um: move sysrq.h out of include/sharedAl Viro4-8/+8
never used by userland-side objects Signed-off-by: Al Viro <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
2012-10-09um/x86: merge 32 and 64 bit variants of ptrace.hAl Viro3-78/+54
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
2012-10-09um/x86: merge 32 and 64bit variants of checksum.hAl Viro3-265/+144
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
2012-10-09ARM: pxa: armcore: fix PCI PIO warningsArnd Bergmann1-3/+9
The it8152 PCI host used on the pxa/cm_x2xx machines uses the old-style I/O window registration. This should eventually get converted to pci_ioremap_io() but for now, let's cast the IT8152_IO_BASE constant to an integer type to get rid of the warnings. Without this patch, building cm_x2xx_defconfig results in: arch/arm/common/it8152.c: In function 'it8152_pci_setup': arch/arm/common/it8152.c:287:18: warning: assignment makes integer from pointer without a cast [enabled by default] arch/arm/common/it8152.c:288:16: warning: assignment makes integer from pointer without a cast [enabled by default] arch/arm/common/it8152.c:291:17: warning: assignment makes integer from pointer without a cast [enabled by default] Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Igor Grinberg <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Krzysztof Halasa <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Haojian Zhuang <[email protected]> Cc: Eric Miao <[email protected]>
2012-10-09timekeeping: Cast raw_interval to u64 to avoid shift overflowDan Carpenter1-1/+1
We fixed a bunch of integer overflows in timekeeping code during the 3.6 cycle. I did an audit based on that and found this potential overflow. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: John Stultz <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected]
2012-10-09timers: Fix endless looping between cascade() and internal_add_timer()Hildner, Christian1-4/+6
Adding two (or more) timers with large values for "expires" (they have to reside within tv5 in the same list) leads to endless looping between cascade() and internal_add_timer() in case CONFIG_BASE_SMALL is one and jiffies are crossing the value 1 << 18. The bug was introduced between 2.6.11 and 2.6.12 (and survived for quite some time). This patch ensures that when cascade() is called timers within tv5 are not added endlessly to their own list again, instead they are added to the next lower tv level tv4 (as expected). Signed-off-by: Christian Hildner <[email protected]> Reviewed-by: Jan Kiszka <[email protected]> Link: http://lkml.kernel.org/r/98673C87CB31274881CFFE0B65ECC87B0F5FC1963E@DEFTHW99EA4MSX.ww902.siemens.net Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected]
2012-10-09Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux ↵Thomas Gleixner8069-199762/+469400
into timers/core
2012-10-09UAPI: (Scripted) Disintegrate arch/c6x/include/asmDavid Howells10-146/+171
Signed-off-by: David Howells <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Acked-by: Michael Kerrisk <[email protected]> Acked-by: Paul E. McKenney <[email protected]> Acked-by: Dave Jones <[email protected]> Signed-off-by: Mark Salter <[email protected]>
2012-10-09Merge tag 'omap-fixes-a-for-pre3.7' of ↵Tony Lindgren6-30/+54
git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch integration issues, and bugs after the arm-soc merges. Basic test logs are available here: http://www.pwsan.com/omap/testlogs/devel_late_fixes_3.7/20121009084003/ N800 isn't booting; this is a problem present in the base commit and is due to serial driver breakage: http://www.spinics.net/lists/arm-kernel/msg196034.html
2012-10-09RDS: fix rds-ping spinlock recursionjeff.liu1-1/+1
This is the revised patch for fixing rds-ping spinlock recursion according to Venkat's suggestions. RDS ping/pong over TCP feature has been broken for years(2.6.39 to 3.6.0) since we have to set TCP cork and call kernel_sendmsg() between ping/pong which both need to lock "struct sock *sk". However, this lock has already been hold before rds_tcp_data_ready() callback is triggerred. As a result, we always facing spinlock resursion which would resulting in system panic. Given that RDS ping is only used to test the connectivity and not for serious performance measurements, we can queue the pong transmit to rds_wq as a delayed response. Reported-by: Dan Carpenter <[email protected]> CC: Venkat Venkatsubra <[email protected]> CC: David S. Miller <[email protected]> CC: James Morris <[email protected]> Signed-off-by: Jie Liu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-10-09netdev/phy: Prototype of_mdio_find_bus()Mark Brown1-0/+1
Ensure that of_mdio_find_bus() matches the prototype in the header (and stop sparse complaining) by including the header with the prototype. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-10-09farsync: fix support for over 30 cardsDan Carpenter1-1/+1
We're trying to fill a 64 bit bitmap but only the lower 30 shifts work because the shift wraps around. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-10-09be2net: Remove code that stops further access to BE NIC based on UE bitsAjit Khaparde1-2/+5
On certain platforms, BE hardware could falsely indicate UE. For BE family of NICs, do not set hw_error based on the UE bits. If there was a real fatal error, the corresponding h/w block will automatically go offline and stop traffic. Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-10-09pch_gbe: Fix build error by selecting all the possible dependencies.Haicheng Li1-0/+3
Fengguang reported a kernel build failure as following: drivers/built-in.o: In function `pch_gbe_ioctl': pch_gbe_main.c:(.text+0x510370): undefined reference to `pch_ch_control_write' pch_gbe_main.c:(.text+0x510393): undefined reference to `pch_ch_control_write' pch_gbe_main.c:(.text+0x5103b3): undefined reference to `pch_ch_control_write' ... It's a regression by commit da1586461. The root cause is that the CONFIG_PPS is not set there, consequently CONFIG_PTP_1588_CLOCK can not be set anyway, which finally causes ptp_pch and pch_gbe_main build failures. As David prefers to use *select* to fix such module co-dependency issues, this patch explicitly selects all the possible dependencies of PCH_PTP. Reported-by: Fengguang Wu <[email protected]> Reviewed-by: David S. Miller <[email protected]> Signed-off-by: Haicheng Li <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-10-09Merge tag 'disintegrate-isdn-20121009' of ↵David S. Miller3-1/+1
git://git.infradead.org/users/dhowells/linux-headers UAPI Disintegration 2012-10-09 Signed-off-by: David S. Miller <[email protected]>
2012-10-09Merge tag 'disintegrate-net-20121009' of ↵David S. Miller170-1917/+2026
git://git.infradead.org/users/dhowells/linux-headers UAPI Disintegration 2012-10-09 Signed-off-by: David S. Miller <[email protected]>
2012-10-09Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linuxDavid S. Miller3117-48310/+135992
Pulled mainline in order to get the UAPI infrastructure already merged before I pull in David Howells's UAPI trees for networking. Signed-off-by: David S. Miller <[email protected]>
2012-10-09Merge tag 'disintegrate-sparc-20121009' of ↵David S. Miller61-1843/+1951
git://git.infradead.org/users/dhowells/linux-headers UAPI Disintegration 2012-10-09 Signed-off-by: David S. Miller <[email protected]>
2012-10-09firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)Stefan Richter1-2/+2
Fix two bugs of the /dev/fw* character device concerning the FW_CDEV_IOC_GET_INFO ioctl with nonzero fw_cdev_get_info.bus_reset. (Practically all /dev/fw* clients issue this ioctl right after opening the device.) Both bugs are caused by sizeof(struct fw_cdev_event_bus_reset) being 36 without natural alignment and 40 with natural alignment. 1) Memory corruption, affecting i386 userland on amd64 kernel: Userland reserves a 36 bytes large buffer, kernel writes 40 bytes. This has been first found and reported against libraw1394 if compiled with gcc 4.7 which happens to order libraw1394's stack such that the bug became visible as data corruption. 2) Information leak, affecting all kernel architectures except i386: 4 bytes of random kernel stack data were leaked to userspace. Hence limit the respective copy_to_user() to the 32-bit aligned size of struct fw_cdev_event_bus_reset. Reported-by: Simon Kirby <[email protected]> Signed-off-by: Stefan Richter <[email protected]> Cc: [email protected]
2012-10-09Merge branch 'fixes2' into fixesOlof Johansson5-7/+7
Three more warnings fixes from Arnd Bergmann: * fixes2: ARM: integrator: use __iomem pointers for MMIO, part 2 ARM: assabet: fix bogus warning in get_assabet_scr (again) ARM: shmobile: mark shmobile_init_late as __init
2012-10-09ARM: integrator: use __iomem pointers for MMIO, part 2Arnd Bergmann4-7/+7
Due to some interesting merges in the integrator code, not all users of mmio pointers were converted before, this fixes all warnings that got introduced as a consequence. Signed-off-by: Arnd Bergmann <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Russell King <[email protected]>
2012-10-09ARM: assabet: fix bogus warning in get_assabet_scr (again)Arnd Bergmann1-1/+1
Russell fixed this bogus warning before in 2f3eca8b4f "Shut up gcc warning in assabet.c", but apparently gcc has become smarter (or dumber) since 2005, and the same warning came up again. This uses the uninitialized_var() macro to convince gcc that the variable is actually being initialized. 100 times in fact. Without this patch, building assabet_defconfig results in: arch/arm/mach-sa1100/assabet.c: In function 'fixup_assabet': arch/arm/mach-sa1100/assabet.c:397:6: warning: 'scr' may be used uninitialized in this function [-Wuninitialized] arch/arm/mach-sa1100/assabet.c:389:16: note: 'scr' was declared here Signed-off-by: Arnd Bergmann <[email protected]> Cc: Russell King <[email protected]>
2012-10-09ARM: shmobile: mark shmobile_init_late as __initArnd Bergmann1-1/+1
Patch 35f2b0bd59 "ARM: shmobile: Move definition of shmobile_init_late() to header" moved the definition of the shmobile_init_late function, but dropped the __init annotation, which is now causing warnings because the function calls shmobile_suspend_init, which is also marked init. Without this patch, building kota2_defconfig results in: WARNING: vmlinux.o(.text+0xb7c8): Section mismatch in reference from the function shmobile_init_late() to the function .init.text:shmobile_suspend_init() The function shmobile_init_late() references the function __init shmobile_suspend_init(). This is often because shmobile_init_late lacks a __init annotation or the annotation of shmobile_suspend_init is wrong. Signed-off-by: Arnd Bergmann <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Magnus Damm <[email protected]> Cc: Simon Horman <[email protected]>
2012-10-09ARM: integrator_cp: fix build failureOlof Johansson1-2/+2
arch/arm/mach-integrator/integrator_cp.c:272:32: error: 'of_aliases' undeclared (first use in this function) Move the OF-only timer init under #ifdef CONFIG_OF, just like integrator_ap has it. Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2012-10-09btrfs: init ref_index to zero in add_inode_refChris Mason1-1/+1
Signed-off-by: Chris Mason <[email protected]>
2012-10-09mtd: Disable mtdchar mmap on MMU systemsDavid Woodhouse1-1/+5
This code was broken because it assumed that all MTD devices were map-based. Disable it for now, until it can be fixed properly for the next merge window. Signed-off-by: David Woodhouse <[email protected]>
2012-10-09Merge tag 'disintegrate-mtd-20121009' of ↵David Woodhouse10997-272846/+558037
git://git.infradead.org/users/dhowells/linux-headers UAPI Disintegration 2012-10-09 Conflicts: MAINTAINERS arch/arm/configs/bcmring_defconfig arch/arm/mach-imx/clk-imx51-imx53.c drivers/mtd/nand/Kconfig drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h drivers/mtd/nand/orion_nand.c
2012-10-09Btrfs: remove repeated eb->pages check in, disk-io.c/csum_dirty_bufferWang Sheng-Hui1-4/+0
In csum_dirty_buffer, we first get eb from page->private. Then we check if the page is the first page of eb. Later we check it again. Remove the repeated check here. Signed-off-by: Wang Sheng-Hui <[email protected]>
2012-10-09Btrfs: fix page leakageJosef Bacik1-1/+1
Alloc_dummy_extent_buffer will not free the first page in the eb array if we fail to allocate a page, fix this. Thanks, Reported-by: David Sterba <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2012-10-09Btrfs: do not warn_on when we cannot alloc a page for an extent bufferJosef Bacik1-3/+1
It's just annoying and the user will have gotten a nice OOM killer message so they are already fully aware they are screwed :). Thanks, Reported-by: Jérôme Poulin <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2012-10-09Btrfs: don't bug on enomem in readpageJosef Bacik1-4/+7
Get rid of the BUG_ON(ret == -ENOMEM) in __extent_read_full_page. Thanks, Reported-by: Jérôme Poulin <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2012-10-09Btrfs: cleanup pages properly when ENOMEM in compressionJosef Bacik1-3/+10
We were freeing non-existent pages which was causing a panic for a user who was suffering from ENOMEM. This patch fixes the problem. Thanks, Reported-by: Jérôme Poulin <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2012-10-09Btrfs: make filesystem read-only when submitting barrier failsStefan Behrens6-19/+142
So far the return code of barrier_all_devices() is ignored, which means that errors are ignored. The result can be a corrupt filesystem which is not consistent. This commit adds code to evaluate the return code of barrier_all_devices(). The normal btrfs_error() mechanism is used to switch the filesystem into read-only mode when errors are detected. In order to decide whether barrier_all_devices() should return error or success, the number of disks that are allowed to fail the barrier submission is calculated. This calculation accounts for the worst RAID level of metadata, system and data. If single, dup or RAID0 is in use, a single disk error is already considered to be fatal. Otherwise a single disk error is tolerated. The calculation of the number of disks that are tolerated to fail the barrier operation is performed when the filesystem gets mounted, when a balance operation is started and finished, and when devices are added or removed. Signed-off-by: Stefan Behrens <[email protected]>
2012-10-09Btrfs: detect corrupted filesystem after write I/O errorsStefan Behrens1-2/+14
In check-integrity, detect when a superblock is written that points to blocks that have not been written to disk due to I/O write errors. Signed-off-by: Stefan Behrens <[email protected]>
2012-10-09Btrfs: make compress and nodatacow mount options mutually exclusiveAndrei Popa1-1/+13
If a filesystem is mounted with compression and then remounted by adding nodatacow, the compression is disabled but the compress flag is still visible. Also, if a filesystem is mounted with nodatacow and then remounted with compression, nodatacow flag is still present but it's not active. This patch: - removes compress flags and notifies that the compression has been disabled if the filesystem is mounted with nodatacow - removes nodatacow and nodatasum flags if mounted with compress. Signed-off-by: Andrei Popa <[email protected]>
2012-10-09btrfs: fix message printingDaniel J Blueman3-11/+11
Fix various messages to include newline and module prefix. Signed-off-by: Daniel J Blueman <[email protected]>
2012-10-09Btrfs: don't bother committing delayed inode updates when fsyncingJosef Bacik1-19/+65
We can just copy the in memory inode into the tree log directly, no sense in updating the fs tree so we can copy it into the tree log tree. Thanks, Signed-off-by: Josef Bacik <[email protected]>
2012-10-09btrfs: move inline function code to header fileRobin Dong2-14/+12
When building btrfs from kernel code, it will report: fs/btrfs/extent_io.h:281: warning: 'extent_buffer_page' declared inline after being called fs/btrfs/extent_io.h:281: warning: previous declaration of 'extent_buffer_page' was here fs/btrfs/extent_io.h:280: warning: 'num_extent_pages' declared inline after being called fs/btrfs/extent_io.h:280: warning: previous declaration of 'num_extent_pages' was here because of the wrong declaration of inline functions. Signed-off-by: Robin Dong <[email protected]>
2012-10-09Btrfs: remove unnecessary IS_ERR in bio_readpage_error()Tsutomu Itoh1-1/+1
Because the value of extent_map is only a correct value or NULL, so IS_ERR is unnecessary. Signed-off-by: Tsutomu Itoh <[email protected]>
2012-10-09btrfs: remove unused function btrfs_insert_some_items()Robin Dong1-143/+0
The function btrfs_insert_some_items() would not be called by any other functions, so remove it. Signed-off-by: Robin Dong <[email protected]>
2012-10-09Btrfs: don't commit instead of overcommittingJosef Bacik1-28/+6
I don't think we have the same problem that this was supposed to fix originally since we can allocate chunks in the enospc path now. This code is causing us to constantly commit the transaction as we get close to using all of our available space in our currently allocated chunks, instead of allocating another chunk and carrying on with life, which is not nice for performance. Thanks, Signed-off-by: Josef Bacik <[email protected]>
2012-10-09Btrfs: confirmation of value is added before trace_btrfs_get_extent() is calledTsutomu Itoh1-1/+2
We should confirm the value of extent_map before calling trace_btrfs_get_extent() because the value of extent_map has the possibility of NULL. Signed-off-by: Tsutomu Itoh <[email protected]>
2012-10-09Btrfs: be smarter about dropping things from the tree logJosef Bacik1-2/+13
When we truncate existing items in the tree log we've been searching for each individual item and removing them. This is unnecessary churn and searching, just keep track of the slot we are on and how many items we need to delete and delete them all at once. Thanks, Signed-off-by: Josef Bacik <[email protected]>
2012-10-09Btrfs: don't lookup csums for prealloc extentsJosef Bacik1-2/+1
The tree logging stuff was looking up csums to copy over for prealloc extents which is just work we don't need to be doing. Thanks, Signed-off-by: Josef Bacik <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.