aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-28Disintegrate asm/system.h for XtensaDavid Howells15-191/+225
Disintegrate asm/system.h for Xtensa. Signed-off-by: David Howells <[email protected]> cc: Chris Zankel <[email protected]>
2012-03-28Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]Guan Xuetao22-173/+225
Disintegrate asm/system.h for Unicore32. (Compilation successful) The implementation details are not changed, but only splitted. BTW, some codestyles are adjusted. Signed-off-by: David Howells <[email protected]> Signed-off-by: Guan Xuetao <[email protected]>
2012-03-28Disintegrate asm/system.h for TileDavid Howells26-273/+309
Disintegrate asm/system.h for Tile. Signed-off-by: David Howells <[email protected]> Acked-by: Chris Metcalf <[email protected]>
2012-03-28Disintegrate asm/system.h for SparcDavid Howells84-669/+684
Disintegrate asm/system.h for Sparc. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for SHDavid Howells56-396/+503
Disintegrate asm/system.h for SH. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for ScoreDavid Howells8-91/+101
Disintegrate asm/system.h for Score. Not compiled. Signed-off-by: David Howells <[email protected]> cc: Chen Liqin <[email protected]>
2012-03-28Disintegrate asm/system.h for S390David Howells39-335/+369
Disintegrate asm/system.h for S390. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for PowerPCDavid Howells133-701/+687
Disintegrate asm/system.h for PowerPC. Signed-off-by: David Howells <[email protected]> Acked-by: Benjamin Herrenschmidt <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for PA-RISCDavid Howells22-179/+191
Disintegrate asm/system.h for PA-RISC. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for MN10300David Howells27-229/+226
Disintegrate asm/system.h for MN10300. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for MIPSDavid Howells90-309/+262
Disintegrate asm/system.h for MIPS. Signed-off-by: David Howells <[email protected]> Acked-by: Ralf Baechle <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for MicroblazeDavid Howells17-107/+129
Disintegrate asm/system.h for Microblaze. Not compiled. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for M68KDavid Howells46-246/+214
Disintegrate asm/system.h for M68K. Signed-off-by: David Howells <[email protected]> Acked-by: Greg Ungerer <[email protected]> cc: [email protected]
2012-03-28m68k: Fix xchg/cmpxchg to fail to link if given an inappropriate pointerDavid Howells1-4/+16
Fix the m68k versions of xchg() and cmpxchg() to fail to link if given an inappropriately sized pointer rather than BUG()'ing at runtime. Signed-off-by: David Howells <[email protected]> Acked-by: Greg Ungerer <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for M32RDavid Howells22-382/+420
Disintegrate asm/system.h for M32R. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for IA64David Howells61-249/+233
Disintegrate asm/system.h for IA64. Signed-off-by: David Howells <[email protected]> Acked-by: Tony Luck <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for HexagonDavid Howells10-130/+199
Disintegrate asm/system.h for Hexagon. Not compiled. Signed-off-by: David Howells <[email protected]> Acked-by: Richard Kuo <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for H8300David Howells17-152/+158
Disintegrate asm/system.h for H8300. Signed-off-by: David Howells <[email protected]> cc: Yoshinori Sato <[email protected]>
2012-03-28Disintegrate asm/system.h for FRVDavid Howells20-226/+261
Disintegrate asm/system.h for FRV. Signed-off-by: David Howells <[email protected]>
2012-03-28Disintegrate asm/system.h for CRISDavid Howells39-119/+127
Disintegrate asm/system.h for CRIS. Signed-off-by: David Howells <[email protected]> Acked-by: Jesper Nilsson <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for C6XDavid Howells17-170/+241
Disintegrate asm/system.h for C6X. Signed-off-by: David Howells <[email protected]> Signed-off-by: Mark Salter <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for AVR32David Howells11-182/+228
Disintegrate asm/system.h for AVR32. This has not been compiled at all. Signed-off-by: David Howells <[email protected]> cc: Haavard Skinnemoen <[email protected]>
2012-03-28Disintegrate asm/system.h for ARMDavid Howells170-565/+592
Disintegrate asm/system.h for ARM. Signed-off-by: David Howells <[email protected]> cc: Russell King <[email protected]> cc: [email protected]
2012-03-28ARM: move CP15 definitions to separate header fileRussell King18-84/+103
Avoid namespace conflicts with drivers over the CP15 definitions by moving CP15 related prototypes and definitions to a private header file. Acked-by: Stephen Warren <[email protected]> Tested-by: Stephen Warren <[email protected]> [Tegra] Acked-by: H Hartley Sweeten <[email protected]> Tested-by: H Hartley Sweeten <[email protected]> [EP93xx] Acked-by: Nicolas Pitre <[email protected]> Acked-by: Kukjin Kim <[email protected]> Signed-off-by: Russell King <[email protected]> Signed-off-by: David Howells <[email protected]>
2012-03-28Disintegrate asm/system.h for AlphaDavid Howells65-402/+388
Disintegrate asm/system.h for Alpha. Signed-off-by: David Howells <[email protected]> cc: [email protected]
2012-03-28Disintegrate asm/system.h for X86David Howells50-562/+554
Disintegrate asm/system.h for X86. Signed-off-by: David Howells <[email protected]> Acked-by: H. Peter Anvin <[email protected]> cc: [email protected]
2012-03-28Merge tag 'writeback-fixes' of ↵Linus Torvalds1-20/+2
git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux Pull trivial writeback fixes from Wu Fengguang: "They've been tested in linux-next for 20 days actually." * tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux: writeback: Remove outdated comment fs: Remove bogus wait in write_inode_now()
2012-03-28Merge tag 'ext4_for_linus' of ↵Linus Torvalds30-1611/+1522
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 Pull ext4 updates for 3.4 from Ted Ts'o: "Ext4 commits for 3.3 merge window; mostly cleanups and bug fixes The changes to export dirty_writeback_interval are from Artem's s_dirt cleanup patch series. The same is true of the change to remove the s_dirt helper functions which never got used by anyone in-tree. I've run these changes by Al Viro, and am carrying them so that Artem can more easily fix up the rest of the file systems during the next merge window. (Originally we had hopped to remove the use of s_dirt from ext4 during this merge window, but his patches had some bugs, so I ultimately ended dropping them from the ext4 tree.)" * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (66 commits) vfs: remove unused superblock helpers mm: export dirty_writeback_interval ext4: remove useless s_dirt assignment ext4: write superblock only once on unmount ext4: do not mark superblock as dirty unnecessarily ext4: correct ext4_punch_hole return codes ext4: remove restrictive checks for EOFBLOCKS_FL ext4: always set then trimmed blocks count into len ext4: fix trimmed block count accunting ext4: fix start and len arguments handling in ext4_trim_fs() ext4: update s_free_{inodes,blocks}_count during online resize ext4: change some printk() calls to use ext4_msg() instead ext4: avoid output message interleaving in ext4_error_<foo>() ext4: remove trailing newlines from ext4_msg() and ext4_error() messages ext4: add no_printk argument validation, fix fallout ext4: remove redundant "EXT4-fs: " from uses of ext4_msg ext4: give more helpful error message in ext4_ext_rm_leaf() ext4: remove unused code from ext4_ext_map_blocks() ext4: rewrite punch hole to use ext4_ext_remove_space() jbd2: cleanup journal tail after transaction commit ...
2012-03-28Merge branch 'for-linus' of ↵Linus Torvalds13-603/+868
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client Pull Ceph updates for 3.4-rc1 from Sage Weil: "Alex has been busy. There are a range of rbd and libceph cleanups, especially surrounding device setup and teardown, and a few critical fixes in that code. There are more cleanups in the messenger code, virtual xattrs, a fix for CRC calculation/checks, and lots of other miscellaneous stuff. There's a patch from Amon Ott to make inos behave a bit better on 32-bit boxes, some decode check fixes from Xi Wang, and network throttling fix from Jim Schutt, and a couple RBD fixes from Josh Durgin. No new functionality, just a lot of cleanup and bug fixing." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (65 commits) rbd: move snap_rwsem to the device, rename to header_rwsem ceph: fix three bugs, two in ceph_vxattrcb_file_layout() libceph: isolate kmap() call in write_partial_msg_pages() libceph: rename "page_shift" variable to something sensible libceph: get rid of zero_page_address libceph: only call kernel_sendpage() via helper libceph: use kernel_sendpage() for sending zeroes libceph: fix inverted crc option logic libceph: some simple changes libceph: small refactor in write_partial_kvec() libceph: do crc calculations outside loop libceph: separate CRC calculation from byte swapping libceph: use "do" in CRC-related Boolean variables ceph: ensure Boolean options support both senses libceph: a few small changes libceph: make ceph_tcp_connect() return int libceph: encapsulate some messenger cleanup code libceph: make ceph_msgr_wq private libceph: encapsulate connection kvec operations libceph: move prepare_write_banner() ...
2012-03-28Merge branch 'for_linus' of ↵Linus Torvalds8-167/+226
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs Pull ext3, UDF, and quota fixes from Jan Kara: "A couple of ext3 & UDF fixes and also one improvement in quota locking." * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext3: fix start and len arguments handling in ext3_trim_fs() udf: Fix deadlock in udf_release_file() udf: Fix file entry logicalBlocksRecorded udf: Fix handling of i_blocks quota: Make quota code not call tty layer with dqptr_sem held udf: Init/maintain file entry checkpoint field ext3: Update ctime in ext3_splice_branch() only when needed ext3: Don't call dquot_free_block() if we don't update anything udf: Remove unnecessary OOM messages
2012-03-28Merge tag 'for-linus-3.4-merge-window' of ↵Linus Torvalds2-4/+24
git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs Pull 9p changes for the 3.4 merge window from Eric Van Hensbergen. * tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: statfs should not override server f_type net/9p: handle flushed Tclunk/Tremove net/9p: don't allow Tflush to be interrupted
2012-03-28vfs: fix d_ancestor() case in d_materialize_uniqueMichel Lespinasse1-1/+2
In d_materialise_unique() there are 3 subcases to the 'aliased dentry' case; in two subcases the inode i_lock is properly released but this does not occur in the -ELOOP subcase. This seems to have been introduced by commit 1836750115f2 ("fix loop checks in d_materialise_unique()"). Signed-off-by: Michel Lespinasse <[email protected]> Cc: [email protected] # v3.0+ [ Added a comment, and moved the unlock to where we generate the -ELOOP, which seems to be more natural. You probably can't actually trigger this without a buggy network file server - d_materialize_unique() is for finding aliases on non-local filesystems, and the d_ancestor() case is for a hardlinked directory loop. But we should be robust in the case of such buggy servers anyway. ] Signed-off-by: Linus Torvalds <[email protected]>
2012-03-28ALSA: asihpi - fix return type of hpios_locked_mem_alloc()Dan Carpenter2-2/+2
This function returns zero or -ENOMEM, but because it's type is u16, the -ENOMEM gets changed to 65524. None of the callers care, but lets fix it anyway as a cleanup. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-03-28x86, tls: Off by one limit checkDan Carpenter1-2/+2
These are used as offsets into an array of GDT_ENTRY_TLS_ENTRIES members so GDT_ENTRY_TLS_ENTRIES is one past the end of the array. Signed-off-by: Dan Carpenter <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Cc: <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2012-03-29sh: intc: Fix up section mismatch for intc_ack_dataPaul Mundt1-3/+2
intc_ack_data is flagged as __init when it shouldn't be, causing section mismatches in non-init paths like intc_set_ack_handle(): WARNING: drivers/built-in.o(.text+0x5d760): Section mismatch in reference from the function intc_set_ack_handle() to the function .init.text:intc_ack_data() The function intc_set_ack_handle() references the function __init intc_ack_data(). This is often because intc_set_ack_handle lacks a __init annotation or the annotation of intc_ack_data is wrong. Reported-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-03-28perf annotate: addr2line wants addresses in same format as objdumpDavid Miller1-1/+1
Therefore, in symbol__get_source_line(), use map__rip_2objdump instead of calling map->unmap_ip() unconditionally. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2012-03-28perf probe: Finder fails to resolve function name to addressPrashanth Nageshappa1-1/+3
If DIE entries corresponding to declarations appear before definition entry, probe finder returns error instead of continuing to look further for a definition entry. This patch ensures we reach to the DIE entry corresponding to the definition and get the function address. V2: A simpler solution based on Masami's suggestion. Signed-off-by: Prashanth Nageshappa <[email protected]> Acked-by: Masami Hiramatsu <[email protected]> Cc: Ananth N Mavinakayanahalli <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Srikar Dronamraju <[email protected]> Cc: Steven Rostedt <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2012-03-28nfsd: fix NULL pointer dereference in cld_pipe_downcallJeff Layton1-2/+1
If we find that "cup" is NULL in this case, then we obviously don't want to dereference it. What we really want to print in this case is the xid that we copied off earlier. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-03-28nfsd4: memory corruption in numeric_name_to_id()Dan Carpenter1-1/+1
"id" is type is a uid_t (32 bits) but on 64 bit systems strict_strtoul() modifies 64 bits of data. We should use kstrtouint() instead. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
2012-03-28[SCSI] ipr: Driver version 2.5.3Brian King1-2/+2
Signed-off-by: Brian King <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2012-03-28[SCSI] ipr: Increase alignment boundary of command blocksBrian King1-1/+1
The latest generation of ipr hardware performs best when command blocks are aligned to a boundary equal to the size of the command block. Ensure 512 byte alignment, since this is the largest size command block we can send. Signed-off-by: Brian King <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2012-03-28[SCSI] ipr: Increase max concurrent oustanding commandsBrian King2-4/+23
Increase the total number of max concurrent outstanding commands for the most recent family of adapters in order to improve overall adapter performance. Signed-off-by: Brian King <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2012-03-28[SCSI] ipr: Remove unnecessary memory barriersBrian King1-12/+4
The ipr driver added some memory barriers in order to ensure a PowerPC sync instruction was executed prior to sending a command to the adapter to ensure the command block was coherent with respect to the PCI bus's view of memory. However, some time ago, the powerpc architecture writel macros were changed to include the sync since most drivers don't properly handle this. So remove these memory barriers since they are not needed and result in executing twice as many sync instructions, which has a significant performance penalty. Signed-off-by: Brian King <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2012-03-28[SCSI] ipr: Remove unnecessary interrupt clearing on new adaptersBrian King2-6/+17
The latest ipr hardware no longer requires the driver to issue any MMIOs to clear the interrupt so remove this to optimize performance. Signed-off-by: Brian King <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2012-03-28[SCSI] ipr: Fix target id allocation re-use problemBrian King1-8/+9
For the latest ipr SAS adapters, target id's are a completely logical construct that are managed in the ipr driver. This fixes an issue that can arise if a device is deleted via sysfs. If a new device is then physically added, it will use the previous device's target id. If the host is then rescanned, the device that had been deleted, since it is using the same target id as the new device is using, will never be found, resulting in a missing device. Fix this by only freeing the target id only if the resource is actually gone. Signed-off-by: Brian King <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2012-03-28ARM: pxa: fix regulator related build fail in magician_defconfigPaul Gortmaker2-4/+0
commit 737f360d5bef5e01c6cfa755dca0b449a154c1e0 (linux-next) "regulator: Remove support for supplies specified by struct device" deletes the field from the struct, but this platform was still trying to set those fields. Delete the assignments. arch/arm/mach-pxa/magician.c:581: error: unknown field 'dev' specified in initializer arch/arm/mach-pxa/magician.c:581: warning: initialization from incompatible pointer type arch/arm/mach-pxa/magician.c:585: error: unknown field 'dev' specified in initializer arch/arm/mach-pxa/magician.c:585: warning: initialization from incompatible pointer type arch/arm/mach-pxa/hx4700.c:683: error: unknown field 'dev' specified in initializer arch/arm/mach-pxa/hx4700.c:683: warning: initialization from incompatible pointer type arch/arm/mach-pxa/hx4700.c:687: error: unknown field 'dev' specified in initializer arch/arm/mach-pxa/hx4700.c:687: warning: initialization from incompatible pointer type Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: Haojian Zhuang <[email protected]>
2012-03-28[SCSI] atp870u, mpt2sas, qla4xxx use pci_dev->revisionSergei Shtylyov4-12/+6
commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers to use pci_device->revision) converted all drivers to use pci_dev->revision. Convert these three drivers which got missed. Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2012-03-28drm/radeon: Only warn if the intra-domain offset actually exceeds the limit.Michel Dänzer1-1/+11
Fixes spurious warnings. Tested-by: Dave Jones <[email protected]> Tested-by: Steven Rostedt <[email protected]> Tested-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Michel Dänzer <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-03-28cpusets: Remove an unused variableDan Carpenter1-1/+0
We don't use "cpu" any more after 2baab4e904 "sched: Fix select_fallback_rq() vs cpu_active/cpu_online". Signed-off-by: Dan Carpenter <[email protected]> Cc: Paul Menage <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2012-03-28[SCSI] fcoe: Drop the rtnl_mutex before calling fcoe_ctlr_link_upRobert Love1-1/+5
The rtnl_lock is primarily used to serialize networking driver changes as well as to ensure that a networking driver is not removed when making changes to it. fcoe also uses the rtnl_lock to protect the fcoe hostlist. fcoe_create holds the rtnl_lock over the entirity of the routine including a the call to fcoe_ctlr_link_up. This causes the below deadlock because fcoe_ctlr_link_up acquires the fcoe_ctlr ctlr_mutex and this deadlocks with a libfcoe thread that acquires the fcoe_ctlr ctlr_mutex and then the rtnl_lock (to update a MAC address). This patch drops the rtnl_lock before calling fcoe_ctlr_link_up and therefore the deadlock is prevented. https://bugzilla.kernel.org/show_bug.cgi?id=42918 the existing dependency chain (in reverse order) is: -> #1 (&fip->ctlr_mutex){+.+...}: [<c1091f70>] lock_acquire+0x80/0x1b0 [<c147655d>] mutex_lock_nested+0x6d/0x340 [<f8970c32>] fcoe_ctlr_link_up+0x22/0x180 [libfcoe] [<f894620e>] fcoe_create+0x47e/0x6e0 [fcoe] [<f8973dd3>] fcoe_transport_create+0x143/0x250 [libfcoe] [<c10527e0>] param_attr_store+0x30/0x60 [<c1052696>] module_attr_store+0x26/0x40 [<c11a201e>] sysfs_write_file+0xae/0x100 [<c11449df>] vfs_write+0x8f/0x160 [<c1144cbd>] sys_write+0x3d/0x70 [<c147a0c4>] syscall_call+0x7/0xb -> #0 (rtnl_mutex){+.+.+.}: [<c109164b>] __lock_acquire+0x140b/0x1720 [<c1091f70>] lock_acquire+0x80/0x1b0 [<c147655d>] mutex_lock_nested+0x6d/0x340 [<c13a10c4>] rtnl_lock+0x14/0x20 [<f89445ac>] fcoe_update_src_mac+0x2c/0xb0 [fcoe] [<f8971712>] fcoe_ctlr_timer_work+0x712/0xb60 [libfcoe] [<c104fb69>] process_one_work+0x179/0x5d0 [<c10502f1>] worker_thread+0x121/0x2d0 [<c10550ed>] kthread+0x7d/0x90 [<c1481a82>] kernel_thread_helper+0x6/0x10 other info that might help us debug this: Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&fip->ctlr_mutex); lock(rtnl_mutex); lock(&fip->ctlr_mutex); lock(rtnl_mutex); *** DEADLOCK *** Signed-off-by: Robert Love <[email protected]> Signed-off-by: James Bottomley <[email protected]>