commit 0eca52a92735f43462165efe00a7e394345fb38e Merge: 19d031e 24df31a Author: Linus Torvalds Date: Mon Oct 5 14:39:22 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "ide: try to use PIO Mode 0 during probe if possible" ide: use printk_once commit 19d031e052bc213cdcbee70696d476136994b8c1 Merge: e8d809c 3da0dd4 Author: Linus Torvalds Date: Mon Oct 5 12:07:39 2009 -0700 Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: add support for change_pte mmu notifiers KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes KVM: MMU: dont hold pagecount reference for mapped sptes pages KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID KVM: VMX: flush TLB with INVEPT on cpu migration KVM: fix LAPIC timer period overflow KVM: s390: fix memsize >= 4G KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly KVM: SVM: Fix tsc offset adjustment when running nested commit e8d809c61325a2f799dc753b0ac72ace6958b92c Merge: ef790fe 131e4e9 Author: Linus Torvalds Date: Mon Oct 5 12:06:59 2009 -0700 Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Clear sticky FSR register after saving it to func parametr microblaze: UMS is used only for MMU kernel commit ef790fe022916a225f7ba7fc565ffc51404655f7 Merge: ed3c661 c4a5743 Author: Linus Torvalds Date: Mon Oct 5 12:06:40 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: using HZ needs an include of linux/param.h sparc32: convert to asm-generic/hardirq.h sparc64: Cache per-cpu %pcr register value in perf code. sparc64: Fix comment typo in perf_event.c sparc64: Minor coding style fixups in perf code. sparc64: Add a basic conflict engine in preparation for multi-counter support. sparc64: Increase vmalloc size to fix percpu regressions. sparc64: Add initial perf event conflict resolution and checks. sparc: Niagara1 perf event support. sparc: Add Niagara2 HW cache event support. sparc: Support all ultra3 and ultra4 derivatives. sparc: Support HW cache events. commit ed3c661448a1b4b0b07c0a0d3c6e8a19c7d0ffd7 Author: Jan Beulich Date: Fri Oct 2 16:12:39 2009 +0100 iSCSI/iBFT: use proper address translation In virtual environments (namely, Xen Dom0) virt <-> phys and virt <-> isa-bus translations cannot be freely interchanged (and even outside such environments it is not really correct to do so). When looking at memory below 1M, the latter translations should always be used. iscsi_ibft_find.c part from: Martin Wilck . Signed-off-by: Jan Beulich Signed-off-by: Peter Jones Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Linus Torvalds commit 41cb6654eb2cf01476223a3742946b9f65bd1bbd Merge: e69a9ac 1ad0560 Author: Linus Torvalds Date: Mon Oct 5 12:04:41 2009 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf tools: Run generate-cmdlist.sh properly perf_event: Clean up perf_event_init_task() perf_event: Fix event group handling in __perf_event_sched_*() perf timechart: Add a power-only mode perf top: Add poll_idle to the skip list commit e69a9ac59629db81971a9e03048f9a107712947a Merge: 0f26ec6 d3f6302 Author: Linus Torvalds Date: Mon Oct 5 12:04:16 2009 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer: Remove overly verbose "switch to high res mode" message commit 0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a Merge: 46302b4 f9ac5a6 Author: Linus Torvalds Date: Mon Oct 5 12:03:43 2009 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kmemtrace: Fix up tracer registration tracing: Fix infinite recursion in ftrace_update_pid_func() commit 46302b46e5cf9e23859360e38c540be6e3465c6b Merge: 5b1755f 24e3580 Author: Linus Torvalds Date: Mon Oct 5 12:02:18 2009 -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: x86: Don't leak 64-bit kernel register values to 32-bit processes x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y x86: Fix csum_ipv6_magic asm memory clobber x86: Optimize cmpxchg64() at build-time some more commit 5b1755f23b98e0afaedaec8344002ab184646286 Merge: 374576a c84b564 Author: Linus Torvalds Date: Mon Oct 5 11:56:55 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: fix rename of pt_regs offset defines breakage m68knommu: remove duplicated #include m68knommu: show KiB rather than pages in "Freeing initrd memory:" message commit 131e4e97bfee809dc64febe8accef2f042a92722 Author: Michal Simek Date: Mon Sep 28 08:50:53 2009 +0200 microblaze: Clear sticky FSR register after saving it to func parametr Previous patch d63678d607d0e37ec7abe5ceb545d7e8aab956a4 clear it for noMMU kernel. This one do it for MMU. Correct noMMU version Signed-off-by: Michal Simek commit f1ae3f6918ee4a437b4166a4deab4bd79629bc09 Author: Michal Simek Date: Fri Sep 25 11:52:50 2009 +0200 microblaze: UMS is used only for MMU kernel Signed-off-by: Michal Simek commit c4a57435db67c4522c2e688c357051f35e36d6d6 Author: Stephen Rothwell Date: Mon Oct 5 00:46:08 2009 -0700 sparc: using HZ needs an include of linux/param.h Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit 24df31acaff8465d797f0006437b45ad0f2a5cb1 Author: David S. Miller Date: Sun Oct 4 21:00:17 2009 -0700 Revert "ide: try to use PIO Mode 0 during probe if possible" This reverts commit 6029336426a2b43e4bc6f4a84be8789a047d139e. Based upon a report by David Fries, wherein his system hangs on bootup with sis5513 controller, right after the CDROM is registered by ide-cd.c and the TOC is first read. Signed-off-by: David S. Miller commit 3da0dd433dc399a8c0124d0614d82a09b6a49bce Author: Izik Eidus Date: Wed Sep 23 21:47:18 2009 +0300 KVM: add support for change_pte mmu notifiers this is needed for kvm if it want ksm to directly map pages into its shadow page tables. [marcelo: cast pfn assignment to u64] Signed-off-by: Izik Eidus Signed-off-by: Marcelo Tosatti commit 1403283acca398e244ece35741ad251c1feb5972 Author: Izik Eidus Date: Wed Sep 23 21:47:17 2009 +0300 KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes this flag notify that the host physical page we are pointing to from the spte is write protected, and therefore we cant change its access to be write unless we run get_user_pages(write = 1). (this is needed for change_pte support in kvm) Signed-off-by: Izik Eidus Signed-off-by: Marcelo Tosatti commit acb66dd051d0834c8b36d147ff83a8d39da0fe0b Author: Izik Eidus Date: Wed Sep 23 21:47:16 2009 +0300 KVM: MMU: dont hold pagecount reference for mapped sptes pages When using mmu notifiers, we are allowed to remove the page count reference tooken by get_user_pages to a specific page that is mapped inside the shadow page tables. This is needed so we can balance the pagecount against mapcount checking. (Right now kvm increase the pagecount and does not increase the mapcount when mapping page into shadow page table entry, so when comparing pagecount against mapcount, you have no reliable result.) Signed-off-by: Izik Eidus Signed-off-by: Marcelo Tosatti commit 6a54435560efdab1a08f429a954df4d6c740bddf Author: Avi Kivity Date: Sun Oct 4 16:45:13 2009 +0200 KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID The number of entries is multiplied by the entry size, which can overflow on 32-bit hosts. Bound the entry count instead. Reported-by: David Wagner Cc: stable@kernel.org Signed-off-by: Avi Kivity commit eb5109e311b5152c0614a28d7d615d087f268f19 Author: Marcelo Tosatti Date: Thu Oct 1 19:16:58 2009 -0300 KVM: VMX: flush TLB with INVEPT on cpu migration It is possible that stale EPTP-tagged mappings are used, if a vcpu migrates to a different pcpu. Set KVM_REQ_TLB_FLUSH in vmx_vcpu_load, when switching pcpus, which will invalidate both VPID and EPT mappings on the next vm-entry. Cc: stable@kernel.org Signed-off-by: Marcelo Tosatti commit b2d83cfa3fdefe5c6573d443d099a18dc3a93c5f Author: Aurelien Jarno Date: Fri Sep 25 11:09:37 2009 +0200 KVM: fix LAPIC timer period overflow Don't overflow when computing the 64-bit period from 32-bit registers. Fixes sourceforge bug #2826486. Signed-off-by: Aurelien Jarno Cc: stable@kernel.org Signed-off-by: Marcelo Tosatti commit 8feda6f786fc44f5f8b5cf88e3b6c03514f5be93 Author: Christian Borntraeger Date: Mon Sep 21 10:45:18 2009 +0200 KVM: s390: fix memsize >= 4G commit 628eb9b8a8f3 KVM: s390: streamline memslot handling introduced kvm_s390_vcpu_get_memsize. This broke guests >=4G, since this function returned an int. This patch changes the return value to a long. Signed-off-by: Christian Borntraeger Signed-off-by: Avi Kivity commit 20824f30bb0b8ae0a4099895fd4509f54cf2e1e2 Author: Joerg Roedel Date: Wed Sep 16 15:24:18 2009 +0200 KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly When running nested we need to touch the l1 guests tsc_offset. Otherwise changes will be lost or a wrong value be read. Cc: stable@kernel.org Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 77b1ab1732feb5e3dcbaf31d2f7547c5229f5f3a Author: Joerg Roedel Date: Wed Sep 16 15:24:17 2009 +0200 KVM: SVM: Fix tsc offset adjustment when running nested When svm_vcpu_load is called while the vcpu is running in guest mode the tsc adjustment made there is lost on the next emulated #vmexit. This causes the tsc running backwards in the guest. This patch fixes the issue by also adjusting the tsc_offset in the emulated hsave area so that it will not get lost. Cc: stable@kernel.org Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit c416850580cbdcca7e601dda8a243f5cac35aa88 Author: Christoph Hellwig Date: Thu Oct 1 13:45:13 2009 -0700 sparc32: convert to asm-generic/hardirq.h From: Christoph Hellwig [akpm@linux-foundation.org: /arch/sparc/include/asm/irq_32.h: move NR_IRQS definition] Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f9ac5a69edee0ee7e06a05727226e3f275306c8d Author: Paul Mundt Date: Mon Sep 28 16:55:40 2009 +0900 kmemtrace: Fix up tracer registration Commit ddc1637af217dbd8bc51f30e6d24e84476a869a6 ("kmemtrace: Print binary output only if 'bin' option is set") ended up inverting the error detection logic. register_tracer() returns 0 on success, which this change caused to treat as an error, resulting in: [ 0.132000] Warning: could not register the kmem tracer as well as bailing out of the initcall with an error value. This restores the old logic. Signed-off-by: Paul Mundt Acked-by: Pekka Enberg Acked-by: Frederic Weisbecker Cc: Eduard - Gabriel Munteanu Cc: Steven Rostedt Cc: Li Zefan LKML-Reference: <20090928075540.GD6668@linux-sh.org> Signed-off-by: Ingo Molnar commit 24e35800cdc4350fc34e2bed37b608a9e13ab3b6 Author: Jan Beulich Date: Wed Sep 30 11:22:11 2009 +0100 x86: Don't leak 64-bit kernel register values to 32-bit processes While 32-bit processes can't directly access R8...R15, they can gain access to these registers by temporarily switching themselves into 64-bit mode. Therefore, registers not preserved anyway by called C functions (i.e. R8...R11) must be cleared prior to returning to user mode. Signed-off-by: Jan Beulich Cc: LKML-Reference: <4AC34D73020000780001744A@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 4701472e441e41be2549a25228f703bc9cd13b5b Author: Jaswinder Singh Rajput Date: Sat Sep 26 21:41:41 2009 +0530 x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL Remove unused CONFIG FAST_CMPXCHG_LOCAL from Kconfig. Reported-by: Robert P. J. Day Signed-off-by: Jaswinder Singh Rajput Acked-by: Christoph Lameter Cc: Pekka Enberg Cc: Matt Mackall Cc: Andrew Morton Cc: "Robert P. J. Day" Cc: linux-mm@kvack.org LKML-Reference: <1253981501.4568.61.camel@ht.satnam> Signed-off-by: Ingo Molnar commit ea3acb199a5d7e4da1de0a4288eba993b29f33b9 Author: Jason Wessel Date: Thu Sep 24 09:08:30 2009 -0500 x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg Commit c953094 ("early_printk: Allow more than one early console") introduced a regression in the parsing of the earlyprintk= kernel arguments. If you specify "earlyprintk=serial,ttyS0,115200" as a kernel argument, the "serial,ttyS" should be parsed as a single argument and not as "serial" and then "ttyS". Also update the documentation to reflect you can specify the ttyS directly without the "serial" argument. Signed-off-by: Jason Wessel Cc: Len Brown Cc: Greg KH Cc: Linus Torvalds Cc: Andrew Morton Cc: Johannes Weiner LKML-Reference: <4ABB7D5E.6000301@windriver.com> Signed-off-by: Ingo Molnar commit 1ad0560e8cdb6d5b381220dc2da187691b5ce124 Author: Mulyadi Santosa Date: Sat Sep 26 02:01:41 2009 +0700 perf tools: Run generate-cmdlist.sh properly Right now generate-cmdlist.sh is not executable, so we should call it as an argument ".". This fixes cases where due to different umask defaults the generate-cmdlist.sh script is not executable in a kernel tree checkout. Signed-off-by: Mulyadi Santosa Acked-by: Sam Ravnborg Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar commit 27f9994c50e95f3a5a81fe4c7491a9f9cffe6ec0 Author: Xiao Guangrong Date: Fri Sep 25 13:54:01 2009 +0800 perf_event: Clean up perf_event_init_task() While at it: we can traverse ctx->group_list to get all group leader, it should be safe since we hold ctx->mutex. Changlog v1->v2: - remove WARN_ON_ONCE() according to Peter Zijlstra's suggestion Signed-off-by: Xiao Guangrong Acked-by: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <4ABC5AF9.6060808@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 8c9ed8e14c342ec5e7f27e7e498f62409a10eb29 Author: Xiao Guangrong Date: Fri Sep 25 13:51:17 2009 +0800 perf_event: Fix event group handling in __perf_event_sched_*() Paul Mackerras says: "Actually, looking at this more closely, it has to be a group leader anyway since it's at the top level of ctx->group_list. In fact I see four places where we do: list_for_each_entry(event, &ctx->group_list, group_entry) { if (event == event->group_leader) ... or the equivalent, three of which appear to have been introduced by afedadf2 ("perf_counter: Optimize sched in/out of counters") back in May by Peter Z. As far as I can see the if () is superfluous in each case (a singleton event will be a group of 1 and will have its group_leader pointing to itself)." [ See: http://marc.info/?l=linux-kernel&m=125361238901442&w=2 ] And Peter Zijlstra points out this is a bugfix: "The intent was to call event_sched_{in,out}() for single event groups because that's cheaper than group_sched_{in,out}(), however.. - as you noticed, I got the condition wrong, it should have read: list_empty(&event->sibling_list) - it failed to call group_can_go_on() which deals with ->exclusive. - it also doesn't call hw_perf_group_sched_in() which might break power." [ See: http://marc.info/?l=linux-kernel&m=125369523318583&w=2 ] Changelog v1->v2: - Fix the title name according to Peter Zijlstra's suggestion - Remove the comments and WARN_ON_ONCE() as Peter Zijlstra's suggestion Signed-off-by: Xiao Guangrong Acked-by: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <4ABC5A55.7000208@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 39a90a8ef17fe6fbf4b45e46e3c10d3b8b4a3dea Author: Arjan van de Ven Date: Thu Sep 24 15:40:13 2009 +0200 perf timechart: Add a power-only mode For doing work on the Linux power management components, I need to make long (30+ seconds) traces. Currently, this then results in a HUGE svg file, with mostly process data that isn't interesting. This patch adds a --power-only mode to perf timechart that only outputs the CPU power section of the SVG; this significantly reduces the size of the SVG file, making even 30+ second traces viewable with inkscape. As a minor tweak for the same effect, the minimum text size is decreased; current inkscape cannot zoom in deep enough to show text this small, but it reduces inkscape compute time. Signed-off-by: Arjan van de Ven Cc: peterz@infradead.org LKML-Reference: <20090924154013.0675ab71@infradead.org> Signed-off-by: Ingo Molnar commit 04edbdef02ec4386a2ae38cab7ae7d166e17a756 Author: Eric Dumazet Date: Thu Oct 1 07:30:38 2009 +0200 x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y Conditionaly compile cmpxchg8b_emu.o and EXPORT_SYMBOL(cmpxchg8b_emu). This reduces the kernel size a bit. Signed-off-by: Eric Dumazet Cc: Arjan van de Ven Cc: Martin Schwidefsky Cc: John Stultz Cc: Peter Zijlstra Cc: Linus Torvalds LKML-Reference: <4AC43E7E.1000600@gmail.com> Signed-off-by: Ingo Molnar commit 33974093c024f08caadd2fc71a83bd811ed1831d Author: Matt Fleming Date: Mon Sep 28 16:43:01 2009 +0100 tracing: Fix infinite recursion in ftrace_update_pid_func() When CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST is enabled __ftrace_trace_function contains the current trace function, not ftrace_trace_function. In ftrace_update_pid_func() we currently incorrectly assign the value of ftrace_trace_function to __ftrace_trace_funcion before returning. Without this patch it is possible to execute an infinite recursion whereby ftrace_test_stop_func() calls __ftrace_trace_function, which was assigned ftrace_test_stop_func() in ftrace_update_pid_func(). Signed-off-by: Matt Fleming Acked-by: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: <1254152581-18347-1-git-send-email-matt@console-pimps.org> Signed-off-by: Ingo Molnar commit d1716a60a8ea90788d24aa22d7eec83fbdd2d88a Author: Samuel Thibault Date: Wed Sep 30 16:19:39 2009 -0700 x86: Fix csum_ipv6_magic asm memory clobber Just like ip_fast_csum, the assembly snippet in csum_ipv6_magic needs a memory clobber, as it is only passed the address of the buffer, not a memory reference to the buffer itself. This caused failures in Hurd's pfinetv4 when we tried to compile it with gcc-4.3 (bogus checksums). Signed-off-by: Samuel Thibault Acked-by: David S. Miller Cc: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 982d007a6eec4a0abb404d2355eeec2c041c61ea Author: Linus Torvalds Date: Wed Sep 30 17:57:27 2009 -0700 x86: Optimize cmpxchg64() at build-time some more Try to avoid the 'alternates()' code when we can statically determine that cmpxchg8b is fine. We already have that CONFIG_x86_CMPXCHG64 (enabled by PAE support), and we could easily also enable it for some of the CPU cases. Note, this patch only adds CMPXCHG8B for the obvious Intel CPU's, not for others. (There was something really messy about cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it carefully.) If we avoid that asm-alternative thing when we can assume the instruction exists, we'll generate less support crud, and we'll avoid the whole issue with that extra 'nop' for padding instruction sizes etc. LKML-Reference: Signed-off-by: Ingo Molnar commit 8357275bb919d91093bc5a959932ef7b1ea816e8 Author: Arnaldo Carvalho de Melo Date: Fri Sep 25 15:02:39 2009 -0700 perf top: Add poll_idle to the skip list Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Eric Dumazet Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20090925220239.GA5488@ghostprotocols.net> Signed-off-by: Ingo Molnar commit d17513889a8b754c5872b6b46e6f7822338a0b79 Author: David S. Miller Date: Tue Sep 29 21:27:06 2009 -0700 sparc64: Cache per-cpu %pcr register value in perf code. Signed-off-by: David S. Miller commit c84b564e82777b00ab48178a88bc533ba62b9922 Author: Greg Ungerer Date: Sun Sep 20 21:32:32 2009 +1000 m68knommu: fix rename of pt_regs offset defines breakage Commit f159ee782990aacb5494738c98f13a2aa61dbb4a ("locking, m68k/asm-offsets: Rename pt_regs offset defines") breaks the m68knommu entry code that relies on these define names. Fix the files to match the new define names. Signed-off-by: Greg Ungerer commit 63335138334e5ae40bf485a07b46be59397e50da Author: Huang Weiyi Date: Fri Sep 18 06:18:56 2009 +0800 m68knommu: remove duplicated #include Signed-off-by: Huang Weiyi Signed-off-by: Greg Ungerer commit cd15e8c3313f2831d2d6c7951a93eb5de9621e5a Author: Lennart Sorensen Date: Thu Sep 17 11:49:41 2009 -0400 m68knommu: show KiB rather than pages in "Freeing initrd memory:" message Fix "Freeing initrd memory:" message m68knommu to show kilobytes as claimed rather than number of pages. Signed-off-by: Lennart Sorensen Signed-off-by: Greg Ungerer commit 6e804251d119bbd5522d76bdb0f48f5c9a7abf51 Author: David S. Miller Date: Tue Sep 29 15:10:23 2009 -0700 sparc64: Fix comment typo in perf_event.c Signed-off-by: David S. Miller commit d29862f03575cdfa8819f78b0f3f78eec3b44629 Author: David S. Miller Date: Mon Sep 28 17:37:12 2009 -0700 sparc64: Minor coding style fixups in perf code. These got introduced during the counter --> event tree-wide renaming. Signed-off-by: David S. Miller commit a72a8a5f2ea32074e98803d4b15d0e093c5a9e4d Author: David S. Miller Date: Mon Sep 28 17:35:20 2009 -0700 sparc64: Add a basic conflict engine in preparation for multi-counter support. The hardware counter ->event_base state records and encoding of the "struct perf_event_map" entry used for the event. We use this to make sure that when we have more than 1 event, both can be scheduled into the hardware at the same time. As usual, structure of code is largely cribbed from powerpc. Signed-off-by: David S. Miller commit 1b6b9d62475bdea00b366cb80b0fadba446f176d Author: David S. Miller Date: Mon Sep 28 14:39:58 2009 -0700 sparc64: Increase vmalloc size to fix percpu regressions. Since we now use the embedding percpu allocator we have to make the vmalloc area at least as large as the stretch can be between nodes. Besides some minor asm adjustments, this turned out to be pretty trivial. Signed-off-by: David S. Miller commit 01552f765cae873d0ea3cca1e64e41dfd62659e6 Author: David S. Miller Date: Sun Sep 27 20:43:07 2009 -0700 sparc64: Add initial perf event conflict resolution and checks. Cribbed from powerpc code, as usual. :-) Currently it is only used to validate that all counters have the same user/kernel/hv attributes. Signed-off-by: David S. Miller commit 7eebda60d57a0862a410f45122c73b8bbe6e260c Author: David S. Miller Date: Sat Sep 26 21:23:41 2009 -0700 sparc: Niagara1 perf event support. This chip is extremely limited, and many of the events supported are approximations at best. Signed-off-by: David S. Miller commit d0b86480f5b33f4a86d7c106706d6e0dcd1935ce Author: David S. Miller Date: Sat Sep 26 21:04:16 2009 -0700 sparc: Add Niagara2 HW cache event support. Signed-off-by: David S. Miller commit 28e8f9bead060aafc630a4256d23e2a55fb8b97d Author: David S. Miller Date: Sat Sep 26 20:54:22 2009 -0700 sparc: Support all ultra3 and ultra4 derivatives. For the generic events we support, all of these chips have the same encodings as ultra3i. Signed-off-by: David S. Miller commit 2ce4da2efcaca0dcbfed7a1f24177f18e75e0e89 Author: David S. Miller Date: Sat Sep 26 20:42:10 2009 -0700 sparc: Support HW cache events. First supported chip for HW cache events is Ultra-IIIi. Signed-off-by: David S. Miller commit d3f6302e7e51b41af86c6496ffb2f95e8f2179df Author: Roland Dreier Date: Thu Sep 24 14:07:55 2009 -0700 hrtimer: Remove overly verbose "switch to high res mode" message On big systems, printing copies of Switched to high resolution mode on CPU nnn clutters up the kernel log for minimal gain. Just get rid of them. Signed-off-by: Roland Dreier LKML-Reference: Signed-off-by: Ingo Molnar commit 01f1afaf7b77a16198e65e909e3c410c036eb0d0 Author: Marcin Slusarz Date: Tue Sep 22 16:29:00 2009 -0700 ide: use printk_once Signed-off-by: Marcin Slusarz Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: David S. Miller