commit 140236b4b1c749c9b795ea3d11558a0eb5a3a080 Author: Artem Bityutskiy Date: Thu Jun 10 13:56:33 2010 +0300 VFS: introduce s_dirty accessors This patch introduces 3 VFS accessors: 'sb_mark_dirty()', 'sb_mark_clean()', and 'sb_is_dirty()'. They simply set 'sb->s_dirt' or test 'sb->s_dirt'. The plan is to make every FS use these accessors later instead of manipulating the 'sb->s_dirt' flag directly. Ultimately, this change is a preparation for the periodic superblock synchronization optimization which is about preventing the "sync_supers" kernel thread from waking up even if there is nothing to synchronize. This patch does not do any functional change, just adds accessor functions. Signed-off-by: Artem Bityutskiy Signed-off-by: Linus Torvalds commit 47a716cf0ca981b9549ec9815122ada7a0ff707c Merge: 1cc9629 b945d6b Author: Linus Torvalds Date: Tue Jul 6 17:16:09 2010 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rbtree: Undo augmented trees performance damage and regression x86, Calgary: Limit the max PHB number to 256 commit 1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd Merge: 8b8ce88 153a109 Author: Linus Torvalds Date: Tue Jul 6 17:15:15 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: fix crush device 'out' threshold to 1.0, not 0.1 ceph: fix caps usage accounting for import (non-reserved) case ceph: only release clean, unused caps with mds requests ceph: fix crush CHOOSE_LEAF when type is already a leaf ceph: fix crush recursion ceph: fix caps debugfs entry ceph: delay umount until all mds requests drop inode+dentry refs ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate ceph: fix crush map update decoding ceph: fix message memory leak, uninitialized variable ceph: fix map handler error path ceph: some endianity fixes commit 8b8ce8810b092cef35e15af6577ad569f6145c0a Merge: 7491eb9 e4f1ac2 Author: Linus Torvalds Date: Tue Jul 6 17:14:53 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: do not initialize the present flag too late. commit 7491eb9b5f39dbd9faa32a07d76597ab502166a1 Merge: 7263e71 55dc9d5 Author: Linus Torvalds Date: Tue Jul 6 17:14:33 2010 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits) MIPS: Return after handling coprocessor 2 exception MIPS: BCM47xx: Add NVRAM support devices MIPS: Loongson: Define rtc device on MC146818-equipped systems MIPS: MT: Fix FPU affinity. MIPS: Oprofile: Fixup of loongson2_exit() MIPS: Alchemy: sleepcode without compile-time cputype dependencies MIPS: Tracing: Cleanup of address space checking MIPS: Tracing: Cleanup of function graph tracer MIPS: Tracing: Reduce the overhead of dynamic Function Tracer MIPS: Tracing: Cleanup of instructions used MIPS: Tracing: Fix 32-bit support with -mmcount-ra-address MIPS: Tracing: Fix argument passing of the 32bit support with gcc 4.5 MIPS: Tracing: Cleanup comments MIPS: Tracing: Cleanup the arguments passing of prepare_ftrace_return MIPS: Tracing: Merge adjacent #ifdefs with same condition. MIPS: AR7, BCM63xx: fix gpio_to_irq() return value MIPS: Restore signalling NaN behaviour for abs.[sd] MIPS: Loongson: CS5536: Fix ISA support MIPS: Loongson: Add a missing break statement in CS5536 IDE code MIPS: Loongson: CS5536: Add missing RDMSRs for IDE and USB ... commit 7263e715c91f3de554ab7d4f20f56e080783d0f5 Author: Michal Marek Date: Mon Jul 5 23:43:04 2010 +0200 kbuild: Fix path to scripts/setlocalversion Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch. Reported-by: Stephen Rothwell Reported-and-tested-by: Rafael J. Wysocki Reported-by: Peter Anvin Signed-off-by: Michal Marek Signed-off-by: Linus Torvalds commit 153a10939ea6e42e9c0115b0645060d0d7bb4697 Author: Sage Weil Date: Mon Jul 5 09:44:17 2010 -0700 ceph: fix crush device 'out' threshold to 1.0, not 0.1 Fix a typo that made any OSD weighted between 0.1 and 1.0 effectively weighted as 1.0 (fully in). Signed-off-by: Sage Weil commit 55dc9d51a89ba10a1f7b3ed15f1262eb83e87e74 Author: Jesper Nilsson Date: Thu Jun 17 15:25:54 2010 +0200 MIPS: Return after handling coprocessor 2 exception Breaking here dropped us to the default code which always sends a SIGILL to the current process, no matter what the CU2 notifier says. [Ralf: Currently this only hurts on Cavium and possibly some out of tree platforms.] Signed-off-by: Jesper Nilsson To: linux-mips@linux-mips.org To: linux-kernel@vger.kernel.org Patchwork: http://patchwork.linux-mips.org/patch/1391/ Signed-off-by: Ralf Baechle commit 121915c4ee0812a14bc8d752bc210d0238d755c1 Author: Waldemar Brodkorb Date: Tue Jun 8 19:06:01 2010 +0200 MIPS: BCM47xx: Add NVRAM support devices When trying to netboot a Linksys WRT54GS WLAN router, the bootup fails, because of following error message: ... [ 0.424000] b44: b44.c:v2.0 [ 0.424000] b44: Invalid MAC address found in EEPROM [ 0.432000] b44 ssb0:1: Problem fetching invariants of chip,aborting [ 0.436000] b44: probe of ssb0:1 failed with error -22 ... The router uses a CFE bootloader, but most of the needed environment variables for network card initialization, are not available from CFE via printenv and even though not via cfe_getenv(). The required environment variables are saved in a special partition in flash memory. The attached patch implement nvram_getenv and enables bootup via NFS root on my router. Most of the patch is extracted from the OpenWrt subversion repository and stripped down and cleaned up to just fix this issue. [Ralf: sorted out header file inclusions. Lots of unneded headers and such that should have been included.] Signed-off-by: Waldemar Brodkorb Reviewed-by: Phil Sutter To: linux-mips@linux-mips.org Cc: Hauke Mehrtens Patchwork: http://patchwork.linux-mips.org/patch/1359/ Signed-off-by: Ralf Baechle commit 5df74352876c0835d2b41b53858c9ee779e0f12f Author: Arnaud Patard Date: Wed Jun 2 00:39:54 2010 +0200 MIPS: Loongson: Define rtc device on MC146818-equipped systems This patch declare the rtc device present on systems with clock compatible with the mc146818 and handled by rtc-cmos. Introduce a new Kconfig entry because there are some systems without rtc_cmos compatible clock. Signed-off-by: Arnaud Patard To: linux-mips@linux-mips.org Cc: aba@not.so.argh.org Patchwork: http://patchwork.linux-mips.org/patch/1320/ Signed-off-by: Ralf Baechle commit 17c04139fd2aeaef30fda380bb91b32de7b41a8f Author: Ralf Baechle Date: Sat May 29 03:19:57 2010 +0100 MIPS: MT: Fix FPU affinity. The fragile MT sys_sched_setaffinity wrapper needs its regular dose of fixes. Nose-poked-at-pile-o-crap-by: Julia Lawall Signed-off-by: Ralf Baechle commit 1d84267480ce8cf9943b79b70da86ddb3f95e3dd Author: Wu Zhangjin Date: Fri May 7 01:03:49 2010 +0800 MIPS: Oprofile: Fixup of loongson2_exit() When exiting from loongson2_exit(), we need to reset the counter register too, this patch adds a function reset_counters() to do it, by the way, this function will be shared by Perf. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1199/ Signed-off-by: Ralf Baechle commit 2e93d1ec080e4b21a34869129bda73f24ebb8950 Author: Manuel Lauss Date: Mon May 24 19:42:52 2010 +0200 MIPS: Alchemy: sleepcode without compile-time cputype dependencies Split the low-level sleepcode into per-cpu functions instead of relying on compile-time-defined cpu type. Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/1281/ Signed-off-by: Ralf Baechle commit c9f84873c1231621508cd438bb2991ddba770a69 Author: Wu Zhangjin Date: Fri May 14 19:08:34 2010 +0800 MIPS: Tracing: Cleanup of address space checking This patch adds an inline function in_module() to check which space the instruction pointer in, kernel space or module space. Note: This will not work when the kernel space and module space are the same. If they are the same, we need to modify scripts/recordmcount.pl, ftrace_make_nop/call() and the other related parts to ensure the enabling/disabling of the calling site to _mcount is right for both kernel and module. [Ralf: It also is still incorrect for some 64-bit kernels.] Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1232/ Signed-off-by: Ralf Baechle commit 68ccf7521dc89bfcf01432fd1bf8cb4d7d534e4c Author: Wu Zhangjin Date: Fri May 14 19:08:33 2010 +0800 MIPS: Tracing: Cleanup of function graph tracer Cleans up comments and ftrace_get_parent_addr() of function graph tracer. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1231/ Signed-off-by: Ralf Baechle commit e424054000878d7eb11e44289242886d6e219d22 Author: Wu Zhangjin Date: Fri May 14 19:08:32 2010 +0800 MIPS: Tracing: Reduce the overhead of dynamic Function Tracer With the help of uasm this patch encodes the instructions of the dynamic function tracer in ftrace_dyn_arch_init() when initializing it. As a result we can remove the dynamic encoding of instructions in ftrace_make_nop()/call(), ftrace_enable_ftrace_graph_caller() and remove the macro jump_insn_encode() and at last this reduce the overhead of dynamic Function Tracer. This also is cleaner. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1230/ Signed-off-by: Ralf Baechle commit 4d6829f92a02d96e1bec2ffe6ee674ef3b49722b Author: Wu Zhangjin Date: Fri May 14 19:08:31 2010 +0800 MIPS: Tracing: Cleanup of instructions used This patch adds some cleanups of the instructions: o use macros instead of magic numbers o use macros instead of variables to reduce some overhead o add new macro for the jal instruction Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1229/ Signed-off-by: Ralf Baechle commit 3a2af2dc1bcbfe86b1f39e9e5f9c2c5447943f16 Author: Wu Zhangjin Date: Fri May 14 19:08:30 2010 +0800 MIPS: Tracing: Fix 32-bit support with -mmcount-ra-address For 32-bit kernel the -mmcount-ra-address option of gcc 4.5 emits one extra instruction before calling to _mcount so we need to use a different "b 1f" for it. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1228/ Signed-off-by: Ralf Baechle commit 56b49cd35fd56e29adb8f97ba051a1670d24d133 Author: Wu Zhangjin Date: Fri May 14 19:08:29 2010 +0800 MIPS: Tracing: Fix argument passing of the 32bit support with gcc 4.5 As documented in the GCC 4.5 docs [1] -mmcount-ra-address uses register $12 to pass the stack offset of the return address to the _mcount function. On 64-bit kernels $12 is t0 but in 32-bit kernels it is t4 so we need to use $12 instead of t0 here to be correct for both kernel types. [1] GCC documentation: MIPS Options http://gcc.gnu.org/onlinedocs/gcc/MIPS-Options.html Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1227/ Signed-off-by: Ralf Baechle commit 042e571d224707b777d0995317c74812b960bfeb Author: Wu Zhangjin Date: Fri May 14 19:08:28 2010 +0800 MIPS: Tracing: Cleanup comments Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1225/ Signed-off-by: Ralf Baechle commit cbe555b01b0da9e89afa4babf3b8942d2b052fb8 Author: Wu Zhangjin Date: Fri May 14 19:08:27 2010 +0800 MIPS: Tracing: Cleanup the arguments passing of prepare_ftrace_return Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1226/ Signed-off-by: Ralf Baechle commit 27b118342f2dcd6f0c2cd64453cc5a0289c4b3c9 Author: Wu Zhangjin Date: Fri May 14 19:08:26 2010 +0800 MIPS: Tracing: Merge adjacent #ifdefs with same condition. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1224/ Signed-off-by: Ralf Baechle commit cdf22a4e90ea3ea8e6a7dd9d2fa810b4a3cdfaed Author: Yoichi Yuasa Date: Mon May 24 17:36:24 2010 +0900 MIPS: AR7, BCM63xx: fix gpio_to_irq() return value The return value of gpio_to_irq() is not a pointer but an integer. Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/1280/ Signed-off-by: Ralf Baechle commit e48682ddaa8c553fe36a01be9fa07e2556a640df Author: Chris Dearman Date: Tue May 11 18:30:34 2010 -0700 MIPS: Restore signalling NaN behaviour for abs.[sd] Atsushi Nemoto spotted that this had been incorrectly removed in a previous patch Signed-off-by: Chris Dearman To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1213/ Tested-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 4085467060dc31c8d1201f69e52529a08e2c2407 Author: Wu Zhangjin Date: Wed May 19 09:14:18 2010 +0800 MIPS: Loongson: CS5536: Fix ISA support The function _wrmsr() called by divil_lbar_disable()/enable() should be called with the offset as the argument. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Zhang Le Patchwork: http://patchwork.linux-mips.org/patch/1252/ Signed-off-by: Ralf Baechle commit aa5f858b16d44887cf8a40a746592ae08df5664a Author: Wu Zhangjin Date: Wed May 19 09:13:38 2010 +0800 MIPS: Loongson: Add a missing break statement in CS5536 IDE code Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Zhang Le Cc: Hu Hongbing Patchwork: http://patchwork.linux-mips.org/patch/1251/ Signed-off-by: Ralf Baechle commit f18b2f67eaae0dc0e3aaf1fd8ef320e2b69a514c Author: Wu Zhangjin Date: Wed May 19 09:12:17 2010 +0800 MIPS: Loongson: CS5536: Add missing RDMSRs for IDE and USB Add several missing RDMSRs for IDE and USB are missing to avoid the agressive modification of the high 32 bits of the MSR. Without this patch some usb devices may fail after printing "reset ehci host ....." when reading the partition information. Signed-off-by: Hu Hongbing Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Zhang Le Cc: Hu Hongbing Patchwork: http://patchwork.linux-mips.org/patch/1250/ Signed-off-by: Ralf Baechle commit e1df057df814a4a70a8711c0226a1d178c33edaa Author: Florian Fainelli Date: Sun May 16 15:25:30 2010 +0200 MIPS: AR7: Fix typo in ar7.h This fixes a typo on the AR7_RESET_PERIPHERAL define. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1247/ Signed-off-by: Ralf Baechle commit 154615d554596d96dd2b29bba4116fa21770fdc0 Author: Florian Fainelli Date: Sun May 16 15:25:17 2010 +0200 MIPS: AR7: Use correct UART port type PORT_AR7 has the correct TRIG flag (UART_FCR_R_TRIG_00) as well as UART_CAP_AFE being set. This fixes UART on TNETD7300 revision 0x02, which would otherwise mangle some characters, no side effects on other revisions. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1246/ Signed-off-by: Ralf Baechle commit b945d6b2554d550fe95caadc61e521c0ad71fb9c Author: Peter Zijlstra Date: Sat May 29 15:31:43 2010 +0200 rbtree: Undo augmented trees performance damage and regression Reimplement augmented RB-trees without sprinkling extra branches all over the RB-tree code (which lives in the scheduler hot path). This approach is 'borrowed' from Fabio's BFQ implementation and relies on traversing the rebalance path after the RB-tree-op to correct the heap property for insertion/removal and make up for the damage done by the tree rotations. For insertion the rebalance path is trivially that from the new node upwards to the root, for removal it is that from the deepest node in the path from the to be removed node that will still be around after the removal. [ This patch also fixes a video driver regression reported by Ali Gholami Rudi - the memtype->subtree_max_end was updated incorrectly. ] Acked-by: Suresh Siddha Acked-by: Venkatesh Pallipadi Signed-off-by: Peter Zijlstra Tested-by: Ali Gholami Rudi Cc: Fabio Checconi Cc: "H. Peter Anvin" Cc: Andrew Morton Cc: Linus Torvalds LKML-Reference: <1275414172.27810.27961.camel@twins> Signed-off-by: Ingo Molnar commit e4f1ac2122413736bf2791d3af6533f36b46fc61 Author: Dominik Brodowski Date: Sat Jun 19 14:33:56 2010 +0200 pcmcia: do not initialize the present flag too late. The "present" flag was initialized too late -- possibly, a card was already registered at this time, so re-setting the flag to 0 caused pcmcia_dev_present() to fail. Reported-by: Mikulas Patocka Signed-off-by: Dominik Brodowski commit d596043d71ff0d7b3d0bead19b1d68c55f003093 Author: Darrick J. Wong Date: Wed Jun 30 17:45:19 2010 -0700 x86, Calgary: Limit the max PHB number to 256 The x3950 family can have as many as 256 PCI buses in a single system, so change the limits to the maximum. Since there can only be 256 PCI buses in one domain, we no longer need the BUG_ON check. Signed-off-by: Darrick J. Wong LKML-Reference: <20100701004519.GQ15515@tux1.beaverton.ibm.com> Signed-off-by: H. Peter Anvin commit 443b3760a06860187f135c1ecd56c2c7d4ad1022 Author: Sage Weil Date: Tue Jun 29 09:28:39 2010 -0700 ceph: fix caps usage accounting for import (non-reserved) case We need to increase the total and used counters when allocating a new cap in the non-reserved (cap import) case. Signed-off-by: Sage Weil commit ec97f88ba6d4256927fde516033ee76d5d85b54a Author: Sage Weil Date: Thu Jun 24 15:12:37 2010 -0700 ceph: only release clean, unused caps with mds requests We can drop caps with an mds request. Ensure we only drop unused AND clean caps, since the MDS doesn't support cap writeback in that context, nor do we track it. If caps are dirty, and the MDS needs them back, we it will revoke and we will flush in the normal fashion. This fixes a possibly loss of metadata. Signed-off-by: Sage Weil commit a1a31e734241aefcb2b30fb0cc0376977b6d2ba8 Author: Sage Weil Date: Thu Jun 24 12:58:14 2010 -0700 ceph: fix crush CHOOSE_LEAF when type is already a leaf We may not recurse for CHOOSE_LEAF if we start with a leaf node. When that happens, the out2 vector needs to be filled in with the result. Signed-off-by: Sage Weil commit 55bda7aacd13f5fdfeaafc16934953171405c692 Author: Sage Weil Date: Thu Jun 24 12:55:48 2010 -0700 ceph: fix crush recursion There was a longstanding problem with recursion through intervening bucket types on complex hierarchies. Signed-off-by: Sage Weil commit bfaf148eb2e42c00f1c79b2163f0804068ea0c5e Author: Yehuda Sadeh Date: Wed Jun 23 15:52:27 2010 -0700 ceph: fix caps debugfs entry The ceph client structure was not set correctly. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 17c688c3dfffc274c87be00033da0050bb6eefc0 Author: Sage Weil Date: Mon Jun 21 16:12:26 2010 -0700 ceph: delay umount until all mds requests drop inode+dentry refs This fixes a race between handle_reply finishing an mds request, signalling completion, and then dropping the request structing and its dentry+inode refs, and pre_umount function waiting for requests to finish before letting the vfs tear down the dcache. If umount was delayed waiting for mds requests, we could race and BUG in shrink_dcache_for_umount_subtree because of a slow dput. This delays umount until the msgr queue flushes, which means handle_reply will exit and will have dropped the ceph_mds_request struct. I'm assuming the VFS has already ensured that its calls have all completed and those request refs have thus been dropped as well (I haven't seen that race, at least). Signed-off-by: Sage Weil commit d69ed05a80f23b25f06e73af9b7e701ce4900edc Author: Sage Weil Date: Mon Jun 21 10:38:14 2010 -0700 ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate Handle a splice_dentry failure (due to a d_materialize_unique error) without crashing. (Also, report the error code.) Signed-off-by: Sage Weil commit cebc5be6b6c82a99231e9c9af451e9e3d3399ec6 Author: Sage Weil Date: Thu Jun 17 10:22:48 2010 -0700 ceph: fix crush map update decoding If the incremental osdmap has a new crush map, advance the position after decoding so that we can parse the rest of the osdmap properly. Signed-off-by: Sage Weil commit ae32be31341a5fecfa16c5b3eb78095207182cce Author: Sage Weil Date: Sun Jun 13 10:30:19 2010 -0700 ceph: fix message memory leak, uninitialized variable We need to properly initialize skip, as not all alloc_msg op instances set it. Also, BUG if someone says skip but also allocates a message. Signed-off-by: Sage Weil commit 4a32f93d29b05cdab63c0e2979bc1524c8ea6bf5 Author: Sage Weil Date: Sun Jun 13 10:27:53 2010 -0700 ceph: fix map handler error path Don't leak message if we receive an unexpected message type. Signed-off-by: Sage Weil commit 0cf5537b158caae42bcc03f0f6db10f68585b1ec Author: Yehuda Sadeh Date: Fri Jun 11 15:57:06 2010 -0700 ceph: some endianity fixes Fix some problems that came up with sparse. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil