Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a3ede8c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core to fix conflicts 



Conflicts:
	tools/perf/bench/numa.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0e73453e 215432ed

MAINTAINERS

+3 −50
Original line number Diff line number Diff line
@@ -8917,61 +8917,14 @@ W: http://pegasus2.sourceforge.net/ 
S:	Maintained

F:	drivers/net/usb/rtl8150.c



USB SERIAL BELKIN F5U103 DRIVER

M:	William Greathouse <wgreathouse@smva.com>

USB SERIAL SUBSYSTEM

M:	Johan Hovold <jhovold@gmail.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/belkin_sa.*



USB SERIAL CYPRESS M8 DRIVER

M:	Lonnie Mendez <dignome@gmail.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

W:	http://geocities.com/i0xox0i

W:	http://firstlight.net/cvs

F:	drivers/usb/serial/cypress_m8.*



USB SERIAL CYBERJACK DRIVER

M:	Matthias Bruestle and Harald Welte <support@reiner-sct.com>

W:	http://www.reiner-sct.de/support/treiber_cyberjack.php

S:	Maintained

F:	drivers/usb/serial/cyberjack.c



USB SERIAL DIGI ACCELEPORT DRIVER

M:	Peter Berger <pberger@brimson.com>

M:	Al Borchers <alborchers@steinerpoint.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/digi_acceleport.c



USB SERIAL DRIVER

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-usb@vger.kernel.org

S:	Supported

F:	Documentation/usb/usb-serial.txt

F:	drivers/usb/serial/generic.c

F:	drivers/usb/serial/usb-serial.c

F:	drivers/usb/serial/

F:	include/linux/usb/serial.h



USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER

M:	Gary Brubaker <xavyer@ix.netcom.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/empeg.c



USB SERIAL KEYSPAN DRIVER

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/*keyspan*



USB SERIAL WHITEHEAT DRIVER

M:	Support Department <support@connecttech.com>

L:	linux-usb@vger.kernel.org

W:	http://www.connecttech.com

S:	Supported

F:	drivers/usb/serial/whiteheat*



USB SMSC75XX ETHERNET DRIVER

M:	Steve Glendinning <steve.glendinning@shawell.net>

L:	netdev@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*

arch/arc/mm/fault.c

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <asm/pgalloc.h>

#include <asm/mmu.h>



static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long address)

static int handle_vmalloc_fault(unsigned long address)

{

	/*

	 * Synchronize this task's top level page-table
@@ -27,7 +27,7 @@ static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long address) 
	pud_t *pud, *pud_k;

	pmd_t *pmd, *pmd_k;



	pgd = pgd_offset_fast(mm, address);

	pgd = pgd_offset_fast(current->active_mm, address);

	pgd_k = pgd_offset_k(address);



	if (!pgd_present(*pgd_k))
@@ -72,7 +72,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address) 
	 * nothing more.

	 */

	if (address >= VMALLOC_START && address <= VMALLOC_END) {

		ret = handle_vmalloc_fault(mm, address);

		ret = handle_vmalloc_fault(address);

		if (unlikely(ret))

			goto bad_area_nosemaphore;

		else

arch/mips/kernel/perf_event_mipsxx.c

+2 −2
Original line number Diff line number Diff line
@@ -971,11 +971,11 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map 
[C(LL)] = {

	[C(OP_READ)] = {

		[C(RESULT_ACCESS)]	= { 0x1c, CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN | CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN, P },

	},

	[C(OP_WRITE)] = {

		[C(RESULT_ACCESS)]	= { 0x1c, CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN | CNTR_ODD, P },

		[C(RESULT_MISS)]	= { 0x1d, CNTR_EVEN, P },

	},

},

[C(ITLB)] = {

arch/mips/mti-malta/malta-int.c

+5 −4
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static void __init fill_ipi_map(void) 
{

	int cpu;



	for (cpu = 0; cpu < NR_CPUS; cpu++) {

	for (cpu = 0; cpu < nr_cpu_ids; cpu++) {

		fill_ipi_map1(gic_resched_int_base, cpu, GIC_CPU_INT1);

		fill_ipi_map1(gic_call_int_base, cpu, GIC_CPU_INT2);

	}
@@ -574,8 +574,9 @@ void __init arch_init_irq(void) 
		/* FIXME */

		int i;

#if defined(CONFIG_MIPS_MT_SMP)

		gic_call_int_base = GIC_NUM_INTRS - NR_CPUS;

		gic_resched_int_base = gic_call_int_base - NR_CPUS;

		gic_call_int_base = GIC_NUM_INTRS -

			(NR_CPUS - nr_cpu_ids) * 2 - nr_cpu_ids;

		gic_resched_int_base = gic_call_int_base - nr_cpu_ids;

		fill_ipi_map();

#endif

		gic_init(GIC_BASE_ADDR, GIC_ADDRSPACE_SZ, gic_intr_map,
@@ -599,7 +600,7 @@ void __init arch_init_irq(void) 
		printk("CPU%d: status register now %08x\n", smp_processor_id(), read_c0_status());

		write_c0_status(0x1100dc00);

		printk("CPU%d: status register frc %08x\n", smp_processor_id(), read_c0_status());

		for (i = 0; i < NR_CPUS; i++) {

		for (i = 0; i < nr_cpu_ids; i++) {

			arch_init_ipiirq(MIPS_GIC_IRQ_BASE +

					 GIC_RESCHED_INT(i), &irq_resched);

			arch_init_ipiirq(MIPS_GIC_IRQ_BASE +