aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-28dm exception store: fix init error pathAndrei Warkentin1-1/+1
Call the correct exit function on failure in dm_exception_store_init. Signed-off-by: Andrei Warkentin <[email protected]> Acked-by: Mike Snitzer <[email protected]> Cc: [email protected] Signed-off-by: Alasdair G Kergon <[email protected]>
2012-03-28Delete all instances of asm/system.hDavid Howells26-140/+0
Delete all instances of asm/system.h as they should be redundant by this point. Signed-off-by: David Howells <[email protected]>
2012-03-28Remove all #inclusions of asm/system.hDavid Howells510-512/+4
Remove all #inclusions of asm/system.h preparatory to splitting and killing it. Performed with the following command: perl -p -i -e 's!^#\s*include\s*<asm/system[.]h>.*\n!!' `grep -Irl '^#\s*include\s*<asm/system[.]h>' *` Signed-off-by: David Howells <[email protected]>
2012-03-28Add #includes needed to permit the removal of asm/system.hDavid Howells10-3/+11
asm/system.h is a cause of circular dependency problems because it contains commonly used primitive stuff like barrier definitions and uncommonly used stuff like switch_to() that might require MMU definitions. asm/system.h has been disintegrated by this point on all arches into the following common segments: (1) asm/barrier.h Moved memory barrier definitions here. (2) asm/cmpxchg.h Moved xchg() and cmpxchg() here. #included in asm/atomic.h. (3) asm/bug.h Moved die() and similar here. (4) asm/exec.h Moved arch_align_stack() here. (5) asm/elf.h Moved AT_VECTOR_SIZE_ARCH here. (6) asm/switch_to.h Moved switch_to() here. Signed-off-by: David Howells <[email protected]>
2012-03-28Move all declarations of free_initmem() to linux/mm.hDavid Howells8-9/+2
Move all declarations of free_initmem() to linux/mm.h so that there's only one and it's used by everything. Signed-off-by: David Howells <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected]
2012-03-28Disintegrate asm/system.h for OpenRISCDavid Howells10-43/+8
Disintegrate asm/system.h for OpenRISC. Not compiled. Signed-off-by: David Howells <[email protected]> Acked-by: Arnd Bergmann <[email protected]> cc: [email protected]
2012-03-28Split arch_align_stack() out from asm-generic/system.hDavid Howells2-20/+21
Split arch_align_stack() out from asm-generic/system.h into its own header of asm-generic/exec.h as part of the asm/system.h disintegration. Signed-off-by: David Howells <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2012-03-28Split the switch_to() wrapper out of asm-generic/system.hDavid Howells2-16/+31
Split the switch_to() wrapper out of asm-generic/system.h into its own asm-generic/system.h as part of the asm/system.h disintegration. Signed-off-by: David Howells <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2012-03-28Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.hDavid Howells2-77/+80
Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h to simplify disintegration of asm/system.h. Signed-off-by: David Howells <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2012-03-28Create asm-generic/barrier.hDavid Howells2-33/+51
Create asm-generic/barrier.h and move the barrier definitions from asm-generic/system.h to it. Signed-off-by: David Howells <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2012-03-28Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.hDavid Howells3-1/+4
Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h as all arch files that #include the former also #include the latter. See: grep -rl asm-generic/cmpxchg-local[.]h arch/ | sort > b grep -rl asm-generic/cmpxchg[.]h arch/ | sort > a comm a b This simplifies the disintegration of asm-generic/system.h for arches that don't have their own. Signed-off-by: David Howells <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
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-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-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-27Merge branch 'fixes-non-critical' into next/drivers2Olof Johansson82-224/+421
fixes-non-critical has already been merged upstream, and there are a handful of annoying context conflicts that it makes sense to resolve before sending up. Part of this is because there was parallel development going on between more urgent fixes and general driver fixups, it should settle down once the lpc32xx platform reaches a more steady state. Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-lpc32xx/common.h Signed-off-by: Olof Johansson <[email protected]>
2012-03-27NFSv4: Minor cleanups for nfs4_handle_exception and nfs4_async_handle_errorTrond Myklebust1-5/+5
Signed-off-by: Trond Myklebust <[email protected]>
2012-03-27NFSv4.1: Fix layoutcommit error handlingTrond Myklebust1-12/+13
Firstly, task->tk_status will always return negative error values, so the current tests for 'NFS4ERR_DELEG_REVOKED' etc. are all being ignored. Secondly, clean up the code so that we only need to test task->tk_status once! Signed-off-by: Trond Myklebust <[email protected]> Cc: [email protected]
2012-03-27NFSv4: Fix two infinite loops in the mount codeTrond Myklebust1-2/+4
We can currently loop forever in nfs4_lookup_root() and in nfs41_proc_secinfo_no_name(), if the first iteration returns a NFS4ERR_DELAY or something else that causes exception.retry to get set. Reported-by: Weston Andros Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]> Cc: [email protected]
2012-03-27Merge branch 'for-linus' of ↵Linus Torvalds12-36/+971
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 patches part 2 from Martin Schwidefsky: "Some minor improvements and one additional feature for the 3.4 merge window: Hendrik added perf support for the s390 CPU counters." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: [S390] register cpu devices for SMP=n [S390] perf: add support for s390x CPU counters [S390] oprofile: Allow multiple users of the measurement alert interrupt [S390] qdio: log all adapter characteristics [S390] Remove unncessary export of arch_pick_mmap_layout
Powered by cgit, Gruvboxed by Blaster4385.