From: Jan-Benedict G. <jb...@he...> - 2006-05-08 06:30:29
|
arch/arm/mach-aaec2000/aaed2000.c | 7 ++++- arch/arm/mach-aaec2000/core.c | 5 +-- arch/arm/mach-aaec2000/core.h | 1 arch/arm/mach-imx/mx1ads.c | 2 - arch/arm/mach-sa1100/irq.c | 16 +++++++++++ drivers/rtc/rtc-sa1100.c | 6 ++-- include/asm-arm/arch-aaec2000/debug-macro.S | 1 include/asm-arm/arch-aaec2000/entry-macro.S | 1 include/asm-arm/arch-imx/debug-macro.S | 2 - kernel/ptrace.c | 39 +++++++++++++++------------- 10 files changed, 53 insertions(+), 27 deletions(-) New commits: commit b913f05212dd0c5a779f5a904da335a0521e548a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b913f05212dd0c5a779f5a904da335a0521e548a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b913f05212dd0c5a779f5a904da335a0521e548a Merge: 6e58f44... 9d21f09... Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon May 8 08:28:59 2006 +0200 Merge branch 'master' commit 9d21f09ca03d1142f1988001f228d02581d8986c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d21f09ca03d1142f1988001f228d02581d8986c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d21f09ca03d1142f1988001f228d02581d8986c Merge: f5b40e3... 74fae12... Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 17:32:57 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h [ARM] 3504/1: Fix clcd includes for aaec2000 [ARM] 3503/1: Fix map_desc structure for aaec2000 [ARM] 3501/1: i.MX: fix lowlevel debug macros [ARM] rtc-sa1100: fix compiler warnings and error cleanup [ARM] Allow SA1100 RTC alarm to be configured for wakeup commit 74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:24 2006 +0100 [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 Patch from Bellido Nicolas aaed2000 map_desc.pfn conversion Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9a708becafe99fa32211e8c53dbacefdb4b11718 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:23 2006 +0100 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h Patch from Bellido Nicolas Include hardware.h in debug-macro.S, otherwise io_p2v is undefined. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:22 2006 +0100 [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h Patch from Bellido Nicolas Since git commit 2b78838842346da390e8547cd37035184376d506, entry-macro.S needs to include asm/arch/irqs.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8a33b224ecb576e27695ff8922c8e579dbf7070e Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3504/1: Fix clcd includes for aaec2000 Patch from Bellido Nicolas Since this patch: [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register linux/amba/bus.h needs to be included before linux/amba/clcd.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=16b6dd4419cdef637a907cfc26594e4ebe688975 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3503/1: Fix map_desc structure for aaec2000 Patch from Bellido Nicolas Patch: [ARM] 2982/1: Replace map_desc.physical with map_desc.pfn: aaec2000 incorrectly expanded the struct map_desc for aaec2000. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 216251cff98838f2b79c53fc8a9e76884944be7d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=216251cff98838f2b79c53fc8a9e76884944be7d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=216251cff98838f2b79c53fc8a9e76884944be7d Author: Sascha Hauer <sa...@sa...> Date: Sun May 7 18:56:27 2006 +0100 [ARM] 3501/1: i.MX: fix lowlevel debug macros Patch from Sascha Hauer This patch fixes the addruart macro to work with both mmu enabled and disabled. Signed-off-by: Sascha Hauer <s....@pe...> Signed-off-by: Russell King <rmk...@ar...> commit f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f5b40e363ad6041a96e3da32281d8faa191597b9 Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 10:49:33 2006 -0700 Fix ptrace_attach()/ptrace_traceme()/de_thread() race This holds the task lock (and, for ptrace_attach, the tasklist_lock) over the actual attach event, which closes a race between attacking to a thread that is either doing a PTRACE_TRACEME or getting de-threaded. Thanks to Oleg Nesterov for reminding me about this, and Chris Wright for noticing a lost return value in my first version. Signed-off-by: Linus Torvalds <tor...@os...> commit f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 Author: Russell King <rm...@dy...> Date: Sat May 6 11:29:21 2006 +0100 [ARM] rtc-sa1100: fix compiler warnings and error cleanup Fix: drivers/rtc/rtc-sa1100.c: In function `sa1100_rtc_proc': drivers/rtc/rtc-sa1100.c:298: warning: unsigned int format, long unsigned int arg (arg 3) and arrange for sa1100_rtc_open() to pass the devid to free_irq() rather than NULL. Signed-off-by: Russell King <rmk...@ar...> commit 19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 Author: Russell King <rm...@dy...> Date: Sat May 6 11:26:30 2006 +0100 [ARM] Allow SA1100 RTC alarm to be configured for wakeup The SA1100 RTC alarm can be configured to wake up the CPU from sleep mode, and the RTC driver has been using the API to configure this mode. Unfortunately, the code was which sets the required bit in the hardware was missing. Signed-off-by: Russell King <rmk...@ar...> |