From: Jan-Benedict G. <jb...@he...> - 2006-04-11 08:23:58
|
arch/arm/boot/compressed/vmlinux.lds.in | 1 arch/arm/kernel/setup.c | 6 ++ arch/arm/mach-omap1/devices.c | 11 ---- arch/arm/mach-omap2/devices.c | 10 --- arch/arm/mach-s3c2410/clock.c | 4 + arch/arm/mach-s3c2410/common-smdk.c | 1 arch/arm/mm/cache-v4wb.S | 26 ++++++++-- arch/arm/mm/init.c | 7 +- arch/arm/mm/proc-sa110.S | 25 +-------- arch/arm/mm/proc-sa1100.S | 37 +------------- arch/arm/plat-omap/clock.c | 3 - arch/arm/plat-omap/devices.c | 22 -------- arch/arm/vfp/vfpdouble.c | 29 +++++------ arch/arm/vfp/vfphw.S | 6 -- arch/arm/vfp/vfpsingle.c | 9 ++- fs/Kconfig | 2 fs/configfs/dir.c | 2 fs/exec.c | 7 ++ fs/ocfs2/cluster/heartbeat.c | 40 ++++++++++++--- fs/ocfs2/dlm/userdlm.c | 74 +++++++++++++++++++++-------- fs/ocfs2/file.c | 19 ++++--- include/asm-arm/arch-cl7500/hardware.h | 4 - include/asm-arm/arch-cl7500/memory.h | 6 ++ include/asm-arm/arch-ebsa110/debug-macro.S | 2 include/asm-arm/arch-ebsa110/hardware.h | 3 - include/asm-arm/arch-ebsa110/memory.h | 6 ++ include/asm-arm/arch-ebsa110/uncompress.h | 2 include/asm-arm/arch-ebsa285/hardware.h | 7 -- include/asm-arm/arch-ebsa285/memory.h | 12 ++++ include/asm-arm/arch-ixp23xx/debug-macro.S | 3 + include/asm-arm/arch-l7200/hardware.h | 3 - include/asm-arm/arch-l7200/memory.h | 6 ++ include/asm-arm/arch-rpc/hardware.h | 3 - include/asm-arm/arch-rpc/memory.h | 6 ++ include/asm-arm/arch-sa1100/hardware.h | 4 - include/asm-arm/arch-sa1100/memory.h | 7 ++ include/asm-arm/arch-shark/hardware.h | 6 -- include/asm-arm/arch-shark/memory.h | 6 ++ include/asm-arm/fpstate.h | 2 include/asm-arm/memory.h | 8 +-- include/asm-arm/vfpmacros.h | 8 +++ include/linux/sched.h | 3 - 42 files changed, 249 insertions(+), 199 deletions(-) New commits: commit 002d17de2dc32fa3a4cd3725eeeb563913a8b12a Merge: 83f0f97... 7827d47... Author: Jan-Benedict Glaw <jb...@d2...> Date: Tue Apr 11 10:22:51 2006 +0200 Merge branch 'vax4linus' commit 7827d473326142d0097fdd2297fe2a47809dd80e Merge: df5fc5d... 30d41bf... Author: Jan-Benedict Glaw <jb...@d2...> Date: Tue Apr 11 10:22:32 2006 +0200 Merge branch 'master' commit 30d41bfbfb40bc6615e62eaa17fead79e3083c32 Merge: e38d557... 1356c19... Author: Linus Torvalds <tor...@g5...> Date: Mon Apr 10 16:45:24 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3473/1: Use numbers 0-15 for the VFP double registers [ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6 [ARM] 3471/1: FTOSI functions should return 0 for NaN [ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features [ARM] 3469/1: S3C24XX: clkout missing hclk selector [ARM] 3468/1: S3C2410: SMDK common include fix [ARM] 3461/1: ARM: OMAP: Fix clk_get() when using id and name [ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release() [ARM] 3459/1: ixp23xx: fix debug serial macros for big-endian operation [ARM] Allow decompressor to be built with -ffunction-sections [ARM] Fix SA110/SA1100 cache flushing [ARM] ebsa110: Fix incorrect serial port address [ARM] Fix ebsa110 debug macros [ARM] Move FLUSH_BASE macros to asm/arch/memory.h [ARM] Remove unnecessary extra parens in include/asm-arm/memory.h [ARM] arm's arch_local_page_offset() fix against 2.6.17-rc1 commit e38d557896c4213dd0919770feac0f4a8f60151b Merge: de12a78... 65714b9... Author: Linus Torvalds <tor...@g5...> Date: Mon Apr 10 16:44:09 2006 -0700 Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 * 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2: [PATCH] CONFIGFS_FS must depend on SYSFS [PATCH] Bogus NULL pointer check in fs/configfs/dir.c ocfs2: Better I/O error handling in heartbeat ocfs2: test and set teardown flag early in user_dlm_destroy_lock() ocfs2: Handle the DLM_CANCELGRANT case in user_unlock_ast() ocfs2: catch an invalid ast case in dlmfs ocfs2: remove an overly aggressive BUG() in dlmfs ocfs2: multi node truncate fix commit de12a7878c11f3b282d640888aa635e0711d0b5e Author: Eric W. Biederman <ebi...@xm...> Date: Mon Apr 10 17:16:49 2006 -0600 [PATCH] de_thread: Don't confuse users do_each_thread. Oleg Nesterov spotted two interesting bugs with the current de_thread code. The simplest is a long standing double decrement of __get_cpu_var(process_counts) in __unhash_process. Caused by two processes exiting when only one was created. The other is that since we no longer detach from the thread_group list it is possible for do_each_thread when run under the tasklist_lock to see the same task_struct twice. Once on the task list as a thread_group_leader, and once on the thread list of another thread. The double appearance in do_each_thread can cause a double increment of mm_core_waiters in zap_threads resulting in problems later on in coredump_wait. To remedy those two problems this patch takes the simple approach of changing the old thread group leader into a child thread. The only routine in release_task that cares is __unhash_process, and it can be trivially seen that we handle cleaning up a thread group leader properly. Since de_thread doesn't change the pid of the exiting leader process and instead shares it with the new leader process. I change thread_group_leader to recognize group leadership based on the group_leader field and not based on pids. This should also be slightly cheaper then the existing thread_group_leader macro. I performed a quick audit and I couldn't see any user of thread_group_leader that cared about the difference. Signed-off-by: Eric W. Biederman <ebi...@xm...> Signed-off-by: Linus Torvalds <tor...@os...> commit 1356c1948da967bc1d4c663762bfe21dfcec4b2f Author: Catalin Marinas <cat...@ar...> Date: Mon Apr 10 21:32:46 2006 +0100 [ARM] 3473/1: Use numbers 0-15 for the VFP double registers Patch from Catalin Marinas This patch changes the double registers numbering to 0-15 from even 0-30, in preparation for future VFP extensions. It also fixes the VFP_REG_ZERO bug (value 16 actually represents the 8th double register with the original numbering). The original mcrr/mrrc on CP10 were generating FMRRS/FMSRR instead of FMRRD/FMDRR. The patch changes to CP11 for the correct instructions. Signed-off-by: Catalin Marinas <cat...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit bb54a335ae6d282a4f177c7b35cd149aa9b0b9be Author: Catalin Marinas <cat...@ar...> Date: Mon Apr 10 21:32:42 2006 +0100 [ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6 Patch from Catalin Marinas The X variants are deprecated starting with ARMv6. Using the D variants, the fpmx_state in vfp_hard_struct is no longer needed. Signed-off-by: Catalin Marinas <cat...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 1320a80d1d2587545f39bc0d2dc3adaf390250ef Author: Catalin Marinas <cat...@ar...> Date: Mon Apr 10 21:32:39 2006 +0100 [ARM] 3471/1: FTOSI functions should return 0 for NaN Patch from Catalin Marinas The NaN case was dealed with by the "exponent >= ... + 32" condition but it was not setting the value "d" to 0. Signed-off-by: Ken'ichi Kuromusha <mu...@ap...> Signed-off-by: Russell King <rmk...@ar...> commit adeff42236aec0601ec979d1a41cd6d9cf5a8c05 Author: Catalin Marinas <cat...@ar...> Date: Mon Apr 10 21:32:35 2006 +0100 [ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features Patch from Catalin Marinas Glibc interprets the HWCAP bits and decides on what features to use. However, even if the features are present in the hardware, they are not always supported by the kernel and hence the corresponding bits have to be cleared from the elf_hwcap variable. Signed-off-by: Catalin Marinas <cat...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 65714b918415e06c92426f6544b2296dae694590 Author: Adrian Bunk <bu...@st...> Date: Sun Mar 26 14:25:52 2006 +0200 [PATCH] CONFIGFS_FS must depend on SYSFS This patch fixes the a compile error with CONFIG_SYSFS=n Configfs is creating, as a matter of policy, the /sys/kernel/config mountpoint. This means it requires CONFIG_SYSFS. Signed-off-by: Adrian Bunk <bu...@st...> Signed-off-by: Joel Becker <joe...@or...> Signed-off-by: Mark Fasheh <mar...@or...> commit cbca692c246874a3cc1b5a9b694add4c39e8bc18 Author: Eric Sesterhenn <sna...@gm...> Date: Thu Mar 23 00:36:54 2006 +0100 [PATCH] Bogus NULL pointer check in fs/configfs/dir.c We check the "group" pointer after we dereference it. This check is bogus, as it cannot be NULL coming in. Signed-off-by: Joel Becker <joe...@or...> Signed-off-by: Mark Fasheh <mar...@or...> commit 7359036d5cdb86d14cfeb06d0e5a1d68f85cf8b7 Author: Ben Dooks <ben...@fl...> Date: Sun Apr 9 22:21:10 2006 +0100 [ARM] 3469/1: S3C24XX: clkout missing hclk selector Patch from Ben Dooks The clkout0/1 output parent code is missing the HCLK option, and does not set clk->parent field after updating the clock field Signed-off-by: Ben Dooks <ben...@fl...> Signed-off-by: Russell King <rmk...@ar...> commit 13011d08346d9d649119cc6ef519209c6f33f1e8 Author: Ben Dooks <ben...@fl...> Date: Sun Apr 9 22:21:09 2006 +0100 [ARM] 3468/1: S3C2410: SMDK common include fix Patch from Ben Dooks common-smdk.c does not include its own header file defining the exported prototypes. Signed-off-by: Ben Dooks <ben...@fl...> Signed-off-by: Russell King <rmk...@ar...> commit 67d4d8352b5a78df422a956657d9be4b860680ab Author: Tony Lindgren <to...@at...> Date: Sun Apr 9 22:21:05 2006 +0100 [ARM] 3461/1: ARM: OMAP: Fix clk_get() when using id and name Patch from Tony Lindgren Recent change to use both id and name when available was not necessarily returning the right clock as it also searched for clock name afterwards. This caused MMC to break on H2 and H3 boards. Signed-off-by: Tony Lindgren <to...@at...> Signed-off-by: Russell King <rmk...@ar...> commit 50e5629aa956c8c82015c90554a9a3fbf54cb404 Author: Tony Lindgren <to...@at...> Date: Sun Apr 9 22:21:02 2006 +0100 [ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release() Patch from Tony Lindgren Remove unnecessary omap_nop_release() as noted by RMK. Signed-off-by: Tony Lindgren <to...@at...> Signed-off-by: Russell King <rmk...@ar...> commit 932355797530f5bd4e1355a2c384e9f3ccc3dcbc Author: Lennert Buytenhek <bu...@wa...> Date: Sun Apr 9 22:20:57 2006 +0100 [ARM] 3459/1: ixp23xx: fix debug serial macros for big-endian operation Patch from Lennert Buytenhek The debug-8250 macros do byte accesses, which means that if we're in big-endian mode, we need to logically OR the UART address with 3, as the LSB byte lane (where UART data and status is transferred) has the highest byte address in the word when we are in big-endian mode. It's unclear why this problem didn't surface earlier. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Russell King <rmk...@ar...> commit c5b8ef62b5df9530c573f00f4106742661425392 Author: Russell King <rm...@dy...> Date: Sun Apr 9 19:08:42 2006 +0100 [ARM] Allow decompressor to be built with -ffunction-sections Arrange for all the text ends up in the right place when -ffunction-sections is used. Signed-off-by: Russell King <rmk...@ar...> commit a9e2ae39170d01937725e1fff2e606baaa71346c Author: Mark Fasheh <mar...@or...> Date: Fri Mar 24 14:20:17 2006 -0800 ocfs2: Better I/O error handling in heartbeat Propagate errors received in o2hb_bio_end_io() back to the heartbeat thread so it can skip re-arming the timer. Signed-off-by: Mark Fasheh <mar...@or...> commit 2cd9888590c52ac7592e3607d0a3174ccd57ef86 Author: Mark Fasheh <mar...@or...> Date: Wed Mar 29 16:49:13 2006 -0800 ocfs2: test and set teardown flag early in user_dlm_destroy_lock() Signed-off-by: Mark Fasheh <mar...@or...> commit f43e6918c0e3906fd4483316f6a1a07bba615908 Author: Mark Fasheh <mar...@or...> Date: Wed Mar 29 18:24:12 2006 -0800 ocfs2: Handle the DLM_CANCELGRANT case in user_unlock_ast() Remove the code which attempted to catch it via dlmunlock() return status - this never happens there. Signed-off-by: Mark Fasheh <mar...@or...> commit cc6eb725955efb026007e1d7da8fe5383981afd2 Author: Mark Fasheh <mar...@or...> Date: Wed Mar 29 10:34:21 2006 -0800 ocfs2: catch an invalid ast case in dlmfs Signed-off-by: Mark Fasheh <mar...@or...> commit 1f7bc828e30fe3e23ea0968b9595ad20e2785978 Author: Mark Fasheh <mar...@or...> Date: Wed Mar 29 10:33:35 2006 -0800 ocfs2: remove an overly aggressive BUG() in dlmfs Don't BUG() user_dlm_unblock_lock() on the absence of the USER_LOCK_BLOCKED flag - this turns out to be a valid case. Make some of the related BUG() statements print more useful information. Signed-off-by: Mark Fasheh <mar...@or...> commit ab0920ce7ebb6d60063c793f227ae198a492251b Author: Mark Fasheh <mar...@or...> Date: Thu Mar 16 15:06:37 2006 -0800 ocfs2: multi node truncate fix Fix ocfs2_truncate_file() so that it forces a truncate_inode_pages() on all interested nodes in all cases of a truncate(), not just allocation change. Signed-off-by: Mark Fasheh <mar...@or...> commit 95f3df6bcb89d370c57b7165f55c5a409d011c8e Author: Russell King <rm...@dy...> Date: Fri Apr 7 13:17:15 2006 +0100 [ARM] Fix SA110/SA1100 cache flushing We had two implementations for flushing the cache, which meant StrongARM caches weren't being correctly flushed. Fix this by always using the v4wb_flush_kern_cache_all method, rather than duplicating it. Signed-off-by: Russell King <rmk...@ar...> commit f1dc24d53e9e91cf795f05751eeb7e220c7c15e1 Author: Russell King <rm...@dy...> Date: Fri Apr 7 11:04:54 2006 +0100 [ARM] ebsa110: Fix incorrect serial port address Signed-off-by: Russell King <rmk...@ar...> commit 6e29ebad0f252b085a3bb0188637f315efda0a48 Author: Russell King <rm...@dy...> Date: Fri Apr 7 10:16:55 2006 +0100 [ARM] Fix ebsa110 debug macros Was including debug-8250.h rather than debug-8250.S Signed-off-by: Russell King <rmk...@ar...> commit 74d02fb9543ec85b04319b5b50926c78e7f07f3e Author: Russell King <rm...@dy...> Date: Tue Apr 4 21:47:43 2006 +0100 [ARM] Move FLUSH_BASE macros to asm/arch/memory.h FLUSH_BASE must be visible to arch/arm/mm/init.c in order for the memory region to be setup. Move these definitions from asm-arm/arch-*/hardware.h into asm-arm/arch-*/memory.h where mm stuff can see them. Signed-off-by: Russell King <rmk...@ar...> commit 7d12963757b9170f162f317b7461353c5fb574e8 Author: Russell King <rm...@dy...> Date: Tue Apr 4 16:25:47 2006 +0100 [ARM] Remove unnecessary extra parens in include/asm-arm/memory.h Signed-off-by: Russell King <rmk...@ar...> commit 0da323505fc7dd6b01d35e6181cb3d45f992726a Author: KAMEZAWA Hiroyuki <kam...@jp...> Date: Tue Apr 4 16:06:00 2006 +0100 [ARM] arm's arch_local_page_offset() fix against 2.6.17-rc1 This patch fixes arch_local_page_offset(pfn,nid) in arm. This new one (added by unify_pfn_to_page patches) is obviously buggy. This macro calculate page offset in a node. Note: about LOCAL_MAP_NR() comment in arm's sub-archs says... /* * Given a kaddr, LOCAL_MAP_NR finds the owning node of the memory * and returns the index corresponding to the appropriate page in the * node's mem_map. */ but LOCAL_MAP_NR() is designed to be able to take both paddr and kaddr. In this case, paddr is better. Signed-off-by: KAMEZAWA Hiroyuki <kam...@jp...> Signed-off-by: Russell King <rmk...@ar...> |