commit efa06708fe77190f31bed5c3cb5da49e211240f5 Merge: 86302f4... 0efc61e... Author: Linus Torvalds Date: Mon Jan 8 15:08:22 2007 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6: selinux: Delete mls_copy_context commit 86302f417561fec802f88fdfc343265689d4a596 Merge: 74bda93... 2dbda7d... Author: Linus Torvalds Date: Mon Jan 8 15:07:31 2007 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] PNX8550: Fix system timer support [MIPS] TX49: Fix use of CDEX build_store_reg() [MIPS] pnx8550: Fix write_config_byte() PCI config space accessor [MIPS] Fix build errors on SEAD [MIPS] SMTC build fix [MIPS] csum_partial and copy in parallel [MIPS] Malta: Add missing MTD file. commit 74bda9310fe9776f3d940057ac2e7881214577d6 Merge: fea5f1e... e97126c... Author: Linus Torvalds Date: Mon Jan 8 15:06:39 2007 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Provide basic printk_clock() implementation [ARM] Resolve fuse and direct-IO failures due to missing cache flushes [ARM] pass vma for flush_anon_page() [ARM] Fix potential MMCI bug [ARM] Fix kernel-mode undefined instruction aborts [ARM] 4082/1: iop3xx: fix iop33x gpio register offset [ARM] 4070/1: arch/arm/kernel: fix warnings from missing includes [ARM] 4079/1: iop: Update MAINTAINERS commit fea5f1e19611d94fbf3905875a427c4cb959cd06 Author: Linus Torvalds Date: Mon Jan 8 15:04:46 2007 -0800 Revert "[PATCH] x86-64: Try multiple timer variants in check_timer" This reverts commit b026872601976f666bae77b609dc490d1834bf77, which has been linked to several problem reports with IO-APIC and the timer. Machines either don't boot because the timer doesn't happen, or we get double timer interrupts because we end up double-routing the timer irq through multiple interfaces. See for example http://lkml.org/lkml/2006/12/16/101 http://lkml.org/lkml/2007/1/3/9 http://bugzilla.kernel.org/show_bug.cgi?id=7789 about some of the discussion. Patches to fix this cleanup exist (and have been confirmed to work fine at least for some of the affected cases) and we'll revisit it for 2.6.21, but this late in the -rc series we're better off just reverting the incomplete commit that caused the problems. Suggested-by: Adrian Bunk Cc: Eric W. Biederman Cc: Yinghai Lu Cc: Andrew Morton Cc: Andi Kleen Signed-off-by: Linus Torvalds commit 0efc61eaee5471acd7399c8536feff280b4966dd Author: Venkat Yekkirala Date: Tue Dec 12 13:02:41 2006 -0600 selinux: Delete mls_copy_context This deletes mls_copy_context() in favor of mls_context_cpy() and replaces mls_scopy_context() with mls_context_cpy_low(). Signed-off-by: Venkat Yekkirala Acked-by: Stephen Smalley Signed-off-by: James Morris commit 2dbda7dceca81adfe57c8884be5c66e70822d89a Author: Vitaly Wool Date: Thu Dec 28 17:14:05 2006 +0300 [MIPS] PNX8550: Fix system timer support the patch inlined below restores proper time accounting for PNX8550-based boards. It also gets rid of #ifdef in the generic code which becomes unnecessary then. It's functionally identical to the previous patch with the same name but it has minor comments from Atsushi and Sergei taken into account. Signed-off-by: Vitaly Wool Signed-off-by: Ralf Baechle commit 33b06b513e804ae64ebd5105fb703ec90bd7e173 Author: Atsushi Nemoto Date: Mon Dec 18 00:38:21 2006 +0900 [MIPS] TX49: Fix use of CDEX build_store_reg() The commit a923660d786a53e78834b19062f7af2535f7f8ad accidently prevents TX49 from using CDEX. Use build_dst_pref() only if prefetch for store was really available. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d98f92371461c5c8cc24e12a212c59b3f437b581 Author: Davy Chan Date: Fri Jan 5 13:56:46 2007 +0800 [MIPS] pnx8550: Fix write_config_byte() PCI config space accessor There's a serious typo in the function: arch/mips/pci/ops-pnx8550.c:write_config_byte() The parameter passed to the function config_access() is PCI_CMD_CONFIG_READ instead of PCI_CMD_CONFIG_WRITE. This renders any attempts to write a single byte to the PCI configuration registers useless. This problem does not exist for write_config_word() nor write_config_dword(). This problem has been there since kernel v2.6.17 and is still there as of kernel v2.6.19.1. Signed-off-by: Ralf Baechle commit f75f369fd783d194cb45632617561ca4d7045849 Author: Atsushi Nemoto Date: Mon Jan 8 01:27:40 2007 +0900 [MIPS] Fix build errors on SEAD Quick and dirty fix for build errors on SEAD. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f9bba75e378776ee4e97adc0555db16695d341e1 Author: Atsushi Nemoto Date: Mon Jan 8 00:50:34 2007 +0900 [MIPS] SMTC build fix Pass "irq" to __DO_IRQ_SMTC_HOOK() macro. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f860c90bd6ce22c6a0a352cc16acc74fba3d628e Author: Atsushi Nemoto Date: Wed Dec 13 01:22:06 2006 +0900 [MIPS] csum_partial and copy in parallel Implement optimized asm version of csum_partial_copy_nocheck, csum_partial_copy_from_user and csum_and_copy_to_user which can do calculate and copy in parallel, based on memcpy.S. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 61e84f99877fa8caaf1be86d51d825406e8d8bc1 Author: Ralf Baechle Date: Tue Dec 12 11:52:34 2006 +0000 [MIPS] Malta: Add missing MTD file. Signed-off-by: Ralf Baechle commit e97126cd9056b3b42cdc862ace2ed66f8026f55b Author: Russell King Date: Mon Jan 8 19:49:12 2007 +0000 [ARM] Provide basic printk_clock() implementation Current sched_clock() implementations on ARM cause unbootable kernels with PRINTK_TIME support enabled. To avoid this, provide a basic printk_clock() implementation which avoids sched_clock() being called before the page tables have been set up. Signed-off-by: Russell King commit 6020dff09252e3670a89edb36baaa4afb9b10d15 Author: Russell King Date: Sat Dec 30 23:17:40 2006 +0000 [ARM] Resolve fuse and direct-IO failures due to missing cache flushes fuse does not work on ARM due to cache incoherency issues - fuse wants to use get_user_pages() to copy data from the current process into kernel space. However, since this accesses userspace via the kernel mapping, the kernel mapping can be out of date wrt data written to userspace. This can lead to unpredictable behaviour (in the case of fuse) or data corruption for direct-IO. This resolves debian bug #402876 Signed-off-by: Russell King commit a6f36be32622730710b2fadacb6e2649defa4371 Author: Russell King Date: Sat Dec 30 22:24:19 2006 +0000 [ARM] pass vma for flush_anon_page() Since get_user_pages() may be used with processes other than the current process and calls flush_anon_page(), flush_anon_page() has to cope in some way with non-current processes. It may not be appropriate, or even desirable to flush a region of virtual memory cache in the current process when that is different to the process that we want the flush to occur for. Therefore, pass the vma into flush_anon_page() so that the architecture can work out whether the 'vmaddr' is for the current process or not. Signed-off-by: Russell King commit e47c222b22cd53c317a5573e1dc5f9e0cbd46380 Author: Russell King Date: Mon Jan 8 16:42:51 2007 +0000 [ARM] Fix potential MMCI bug The MMCI driver might end up aborting the initial command and leaving the data part of the command sequence still in place. Avoid this problem by ensuring that any data sequence is properly cleared out when a command completes. Signed-off-by: Russell King commit db6ccbb61c1291c8aaefadcc8304444f27eeb88d Author: Russell King Date: Sat Jan 6 22:53:48 2007 +0000 [ARM] Fix kernel-mode undefined instruction aborts If the kernel attempts to execute a CP1 or CP2 instruction and it aborts, and a FP emulator is not loaded, we try to return as if to a user context, instead of the proper kernel context. Since the fault came from kernel mode, we must use the kernel return paths. Signed-off-by: Russell King commit 4ac941d2d04ef26a91adf677f3a371818596305d Author: Dan Williams Date: Thu Jan 4 02:14:49 2007 +0100 [ARM] 4082/1: iop3xx: fix iop33x gpio register offset iop33x gpio offset is correct in include/asm-arm/arch-iop33x/iop33x.h, but include/asm-arm/hardware/iop3xx.h adds 4. Signed-off-by: Dan Williams Signed-off-by: Russell King commit 9ca3f07b869c1fbbdfdac3150019a3e4d2948d8e Author: Ben Dooks Date: Sun Dec 24 01:36:35 2006 +0100 [ARM] 4070/1: arch/arm/kernel: fix warnings from missing includes Include to fix the warning: arch/arm/kernel/traps.c:647:6: warning: symbol '__readwrite_bug' was not declared. Should it be static? Include to fix the warning: arch/arm/kernel/time.c:42:1: warning: symbol 'rtc_lock' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e2bdb176ffae3fd2c162db897a05fbad044ff9e9 Author: Dan Williams Date: Tue Jan 2 18:32:37 2007 +0100 [ARM] 4079/1: iop: Update MAINTAINERS Signed-off-by: Dan Williams Signed-off-by: Russell King