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

Commit 729c80c6 authored by Tony Luck's avatar Tony Luck
Browse files

Auto-update from upstream

parents 4eaefb39 f6fdd7d9

CREDITS

+1 −2
Original line number Diff line number Diff line
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario 
S: Canada



N: Zwane Mwaikambo

E: zwane@linuxpower.ca

W: http://function.linuxpower.ca

E: zwane@arm.linux.org.uk

D: Various driver hacking

D: Lowlevel x86 kernel hacking

D: General debugging

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ S: Maintained 


OPL3-SA2, SA3, and SAx DRIVER

P:	Zwane Mwaikambo

M:	zwane@commfireservices.com

M:	zwane@arm.linux.org.uk

L:	linux-sound@vger.kernel.org

S:	Maintained
@@ -1995,7 +1995,7 @@ S: Maintained 


SC1200 WDT DRIVER

P:	Zwane Mwaikambo

M:	zwane@commfireservices.com

M:	zwane@arm.linux.org.uk

S:	Maintained



SCHEDULER

arch/i386/kernel/apic.c

+0 −4
Original line number Diff line number Diff line
@@ -726,15 +726,11 @@ __setup("apic=", apic_set_verbosity); 
static int __init detect_init_APIC (void)

{

	u32 h, l, features;

	extern void get_cpu_vendor(struct cpuinfo_x86*);



	/* Disabled by kernel option? */

	if (enable_local_apic < 0)

		return -1;



	/* Workaround for us being called before identify_cpu(). */

	get_cpu_vendor(&boot_cpu_data);



	switch (boot_cpu_data.x86_vendor) {

	case X86_VENDOR_AMD:

		if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) ||

arch/i386/kernel/nmi.c

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void disable_lapic_nmi_watchdog(void) 
			wrmsr(MSR_P6_EVNTSEL0, 0, 0);

			break;

		case 15:

			if (boot_cpu_data.x86_model > 0x3)

			if (boot_cpu_data.x86_model > 0x4)

				break;



			wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
@@ -432,7 +432,7 @@ void setup_apic_nmi_watchdog (void) 
			setup_p6_watchdog();

			break;

		case 15:

			if (boot_cpu_data.x86_model > 0x3)

			if (boot_cpu_data.x86_model > 0x4)

				return;



			if (!setup_p4_watchdog())

arch/ppc/syslib/ppc4xx_dma.c

+7 −3
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ ppc4xx_clr_dma_status(unsigned int dmanr) 
	return DMA_STATUS_GOOD;

}



#ifdef CONFIG_PPC4xx_EDMA

/*

 * Enables the burst on the channel (BTEN bit in the control/count register)

 * Note:
@@ -685,6 +686,11 @@ ppc4xx_set_burst_size(unsigned int dmanr, unsigned int bsize) 
	return DMA_STATUS_GOOD;

}



EXPORT_SYMBOL(ppc4xx_enable_burst);

EXPORT_SYMBOL(ppc4xx_disable_burst);

EXPORT_SYMBOL(ppc4xx_set_burst_size);

#endif /* CONFIG_PPC4xx_EDMA */



EXPORT_SYMBOL(ppc4xx_init_dma_channel);

EXPORT_SYMBOL(ppc4xx_get_channel_config);

EXPORT_SYMBOL(ppc4xx_set_channel_priority);
@@ -703,6 +709,4 @@ EXPORT_SYMBOL(ppc4xx_enable_dma_interrupt); 
EXPORT_SYMBOL(ppc4xx_disable_dma_interrupt);

EXPORT_SYMBOL(ppc4xx_get_dma_status);

EXPORT_SYMBOL(ppc4xx_clr_dma_status);

EXPORT_SYMBOL(ppc4xx_enable_burst);

EXPORT_SYMBOL(ppc4xx_disable_burst);

EXPORT_SYMBOL(ppc4xx_set_burst_size);